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

diff --git a/.gitignore b/.gitignore
index b5766db..1c59e50 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,7 @@
 /uip/viamail
 /uip/whatnow
 /uip/whom
+/uip/*.exe
 /nmh-*.tar.gz
 /aclocal.m4
 /ylwrap

diff --git a/Makefile.am b/Makefile.am
index 1e326b3..65fd867 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,8 @@ auxexecdir = @libdir@
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
             etc/mhn.defaults man/man.sed $(man_MANS)
+clean-local:
+       @rm -rf RPM
 
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
@@ -365,8 +367,8 @@ install-exec-hook:
        fi
 
 install-data-hook:
-       rm -f $(DESTDIR)/$(man5dir)/mh_profile.5
-       ln $(DESTDIR)/$(man5dir)/mh-profile.5 $(DESTDIR)/$(man5dir)/mh_profile.5
+       rm -f $(DESTDIR)$(man5dir)/mh_profile.5
+       ln $(DESTDIR)$(man5dir)/mh-profile.5 $(DESTDIR)$(man5dir)/mh_profile.5
 ##
 ## Make sure we remove those links at uninstall time
 ##
@@ -486,7 +488,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 (file)
--- 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