X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.in;h=39e027b374ebfe25113dea2591ddf7d360302334;hb=ec8527028003cd9bd8170b5aa3f8ba63020487d3;hp=38a9c1d2d10cbda157cf029c163db1729bdc1b2b;hpb=e8ab951121e1e3805b4e4e914ad119d96b14cb06;p=mmh

diff --git a/Makefile.in b/Makefile.in
index 38a9c1d..39e027b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,7 @@ SHELL = /bin/sh
 @SET_MAKE@
 
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
 VPATH  = @srcdir@
 
 # ========== USER CONFIGURATION SECTION ==========
@@ -32,6 +33,9 @@ etcdir      = @sysconfdir@
 # location of man pages
 mandir      = @mandir@
 
+# RPM build root
+rpmdir      = @rpmdir@
+
 # location of incoming mail
 mailspool   = @mailspool@
 
@@ -196,18 +200,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.
-# _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 '`pwd`'/RPM' \
+# 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' \
-          --define 'srcdir '`pwd` \
-          --define 'tarfile $(tarfile)' \
-          --define 'version '`echo $(VERSION) | sed "s/-/_/g"` \
-          -ba nmh.spec
-	@$(RM) $(tarfile)
+          -ba $(rpmdir)/SPECS/nmh.spec