From: David Levine <levinedl@acm.org>
Date: Thu, 26 Jan 2012 04:22:02 +0000 (-0600)
Subject: Fixed rpm target now that nmhdist is gone.
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=1daa04bab784f205a8863d0eebc918444b2a9042;p=mmh

Fixed rpm target now that nmhdist is gone.
---

diff --git a/Makefile.am b/Makefile.am
index 1e326b3..820ec74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -486,7 +486,7 @@ endif
 ## Our RPM build target
 ##
 
-rpm: $(DIST_ARCHIVES)
+rpm: dist
 	@test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
 	@test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
 	@mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
diff --git a/nmh.spec b/nmh.spec
index e5fdb12..68a67a9 100644
--- a/nmh.spec
+++ b/nmh.spec
@@ -31,8 +31,8 @@
 # nmh.spec used to build the Fedora 15 nmh rpm.
 
 Name:          nmh
-Version:       %(sed "s/-/_/g" $RPM_SOURCE_DIR/VERSION)
-%define        rawversion %(cat $RPM_SOURCE_DIR/VERSION)
+Version:       %(sed "s/-/_/g" VERSION)
+%define        rawversion %(cat VERSION)
 Release:       0%{?dist}
 Summary:       A capable mail handling system with a command line interface.
 Group:         Applications/Internet
@@ -62,7 +62,7 @@ interface for it--nmh only has a command line interface.
 if [ ! -f $RPM_SOURCE_DIR/%tarfile ]; then
   #### The tarfile wasn't already installed and we started with a
   #### workspace (using make rpm), so get it from there.
-  [ -f %srcdir/%tarfile ]  ||  (cd %srcdir  &&  make nmhdist)
+  [ -f %srcdir/%tarfile ]  ||  (cd %srcdir  &&  make dist)
   cp -p %srcdir/%tarfile $RPM_SOURCE_DIR/%tarfile
 fi
 [ -f $RPM_SOURCE_DIR/VERSION ]  ||  cp -p %srcdir/VERSION $RPM_SOURCE_DIR
@@ -80,7 +80,7 @@ else
   %endif
   %configure %configure_opts
 fi
-make all nmhdist
+make all dist
 
 
 %install