X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.in;h=d83cff3a0c4cfb46051aa96879c165a5944b85f6;hb=58af02b57c4d2cc732fea0f5ed86e02789d92438;hp=598173ff5e9742afa83702ce174b90249b4def6f;hpb=96bc1e4a303b5e1a43323a1f9186138cb921f0a3;p=mmh

diff --git a/Makefile.in b/Makefile.in
index 598173f..d83cff3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,6 +10,7 @@ SHELL = /bin/sh
 
 srcdir = @srcdir@
 abs_srcdir = @abs_srcdir@
+datarootdir = @datarootdir@
 VPATH  = @srcdir@
 
 # ========== USER CONFIGURATION SECTION ==========
@@ -200,18 +201,15 @@ 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.
+# Create binary and source RPMs.
 # _topdir is the specified RPM build root.
 # _tmppath is TMP below _topdir.
-# srcdir is the top level nmh source directory.
-# tarfile and version are as specified in this file.  rpmbuild does
-#   not allow Version to contain any dashes.
-rpm: all nmhdist
+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' \
-          --define 'srcdir $(abs_srcdir)' \
-          --define 'tarfile $(tarfile)' \
-          --define 'version '`echo $(VERSION) | sed "s/-/_/g"` \
-          -ba nmh.spec
-	@$(RM) $(tarfile)
+          -ba $(rpmdir)/SPECS/nmh.spec