Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh

[mmh] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a3ef699..c1060ea 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -196,12 +196,18 @@ nmhrelease:
        cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz
        cd $(ftpdir) && md5sum *.gz > MD5SUM
 
-# Create binary and source RPMs.  Be care if using any existing build
-# (make) products:  it's usually a good idea to run make realclean first.
+# 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)