X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.in;h=8bb2b40d5e1faec183e62f02e4f0b459b946e9bf;hb=ca34fbd0a5204d47ad019f64ef03d21ebd3397fd;hp=7cd91b04f5f5bc85fe5d4a36e592d8d654fede91;hpb=4c4e933cf4f3c7b74a5a17d7ac3caf1b06fccb85;p=mmh

diff --git a/Makefile.in b/Makefile.in
index 7cd91b0..8bb2b40 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for top level of nmh distribution
 #
-# $Id$
-#
 
 # nmh version
 VERSION = @VERSION@
@@ -11,6 +9,8 @@ SHELL = /bin/sh
 @SET_MAKE@
 
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
+datarootdir = @datarootdir@
 VPATH  = @srcdir@
 
 # ========== USER CONFIGURATION SECTION ==========
@@ -34,6 +34,9 @@ etcdir      = @sysconfdir@
 # location of man pages
 mandir      = @mandir@
 
+# RPM build root
+rpmdir      = @rpmdir@
+
 # location of incoming mail
 mailspool   = @mailspool@
 
@@ -48,7 +51,7 @@ default_pager = @pagerpath@
 
 CC       = @CC@
 CPPFLAGS = @CPPFLAGS@
-DEFS     = @DEFS@
+DEFS     = @DEFS@ @OURDEFS@
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@
 LIBS     = @LIBS@
@@ -72,7 +75,7 @@ INSTALL_DATA    = @INSTALL_DATA@
 # all files in this directory included in the distribution
 DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION		\
 	ChangeLog install-sh mkinstalldirs Makefile.in aclocal.m4	\
-	acconfig.h config.h.in configure.in configure stamp-h.in	\
+	config.h.in configure.ac configure stamp-h.in	\
 	config.sub config.guess
 
 # subdirectories in distribution
@@ -88,7 +91,12 @@ all-recursive:
 	  (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
 	done
 
-install uninstall:
+install: all
+	for subdir in $(SUBDIRS); do \
+	  (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
+	done
+
+uninstall:
 	for subdir in $(SUBDIRS); do \
 	  (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
 	done
@@ -103,11 +111,13 @@ superclean:  superclean-recursive  superclean-local
 
 mostlyclean-local:
 	rm -f *~
+	$(RM) -r autom4te.cache
 
 clean-local: mostlyclean-local
 
 distclean-local: clean-local
 	rm -f Makefile config.h config.status config.log config.cache stamp-h distname
+	$(RM) -r RPM
 
 realclean-local: distclean-local
 
@@ -130,20 +140,20 @@ lint:
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 Makefile: Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	./config.status $@
 
 config.status: configure VERSION
 	./config.status --recheck
 
-configure: configure.in aclocal.m4
+configure: configure.ac aclocal.m4
 	cd $(srcdir) && autoconf
 
 config.h: stamp-h
 stamp-h: config.h.in config.status
-	CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
+	./config.status config.h stamp
 
 config.h.in: stamp-h.in
-stamp-h.in: configure.in acconfig.h aclocal.m4
+stamp-h.in: configure.ac aclocal.m4
 	cd $(srcdir) && autoheader
 	date > $@
 
@@ -192,3 +202,15 @@ nmhrelease:
 	cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz
 	cd $(ftpdir) && md5sum *.gz > MD5SUM
 
+# Create binary and source RPMs.
+# _topdir is the specified RPM build root.
+# _tmppath is TMP below _topdir.
+rpm: nmhdist
+	@test -d $(rpmdir)/SOURCES  ||  mkdir -p $(rpmdir)/SOURCES
+	@test -d $(rpmdir)/SPECS  ||  mkdir -p $(rpmdir)/SPECS
+	@mv -f $(tarfile) $(rpmdir)/SOURCES
+	@cp -p VERSION $(rpmdir)/SOURCES
+	@cp -p nmh.spec $(rpmdir)/SPECS
+	@rpmbuild --define '_topdir $(rpmdir)' \
+          --define '_tmppath %{_topdir}/TMP' \
+          -ba $(rpmdir)/SPECS/nmh.spec