Replace <arpa/ftp.h> with "h/arpa_ftp.h".

[mmh] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c1060ea..39e027b 100644 (file)
--- 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 $(shell 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 $(shell pwd)' \
-          --define 'tarfile $(tarfile)' \
-          --define 'version $(shell echo $(VERSION) | sed "s/-/_/g")' \
-          -ba nmh.spec
-       @$(RM) $(tarfile)
+          -ba $(rpmdir)/SPECS/nmh.spec