X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.in;h=c1060eaa2492b76c96728a1d504dc2d589e500e0;hb=20c00225a5ddc4a1e3bc00f65b9f6ebc5486d950;hp=b331c5da3f1ff1a5a352ab80770d7f101bda37f2;hpb=de84e33cbf49bf0e70ad010d58ab9893c5438cff;p=mmh

diff --git a/Makefile.in b/Makefile.in
index b331c5d..c1060ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for top level of nmh distribution
 #
-# $Id$
-#
 
 # nmh version
 VERSION = @VERSION@
@@ -48,7 +46,7 @@ default_pager = @pagerpath@
 
 CC       = @CC@
 CPPFLAGS = @CPPFLAGS@
-DEFS     = @DEFS@
+DEFS     = @DEFS@ @OURDEFS@
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@
 LIBS     = @LIBS@
@@ -70,12 +68,13 @@ INSTALL_DATA    = @INSTALL_DATA@
 .SUFFIXES:
 
 # all files in this directory included in the distribution
-DIST = ChangeLog COPYRIGHT INSTALL MACHINES README VERSION ChangeLog install-sh\
-       mkinstalldirs Makefile.in aclocal.m4 acconfig.h config.h.in \
-       configure.in configure stamp-h.in config.sub config.guess 
+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.sub config.guess
 
 # subdirectories in distribution
-SUBDIRS = h config sbr zotnet mts uip etc man docs
+SUBDIRS = h config sbr mts uip etc man docs
 
 # ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
@@ -87,7 +86,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
@@ -107,6 +111,7 @@ 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
 
@@ -129,7 +134,7 @@ lint:
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 Makefile: Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	./config.status $@
 
 config.status: configure VERSION
 	./config.status --recheck
@@ -139,7 +144,7 @@ configure: configure.in aclocal.m4
 
 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
@@ -191,3 +196,18 @@ nmhrelease:
 	cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz
 	cd $(ftpdir) && md5sum *.gz > MD5SUM
 
+# Create binary and source RPMs.  Assumes that configure had already
+# been run.  Otherwise, there wouldn't be a Makefile.
+# _topdir puts build area in the RPM/ directory below the current one.
+# _tmppath uses the specified local TMP.
+# srcdir is this current, top level nmh directory.
+# tarfile and version are as specified in this file.  rpmbuild does
+#   not allow Version to contain any dashes.
+rpm: all nmhdist
+	@rpmbuild --define '_topdir $(shell pwd)/RPM' \
+          --define '_tmppath %{_topdir}/TMP' \
+          --define 'srcdir $(shell pwd)' \
+          --define 'tarfile $(tarfile)' \
+          --define 'version $(shell echo $(VERSION) | sed "s/-/_/g")' \
+          -ba nmh.spec
+	@$(RM) $(tarfile)