Convert from our use of aclocal.m4 to a subdirectory with autoconf macros

[mmh] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 38a9c1d..753cb5e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,8 @@ SHELL = /bin/sh
 @SET_MAKE@
 
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
+datarootdir = @datarootdir@
 VPATH  = @srcdir@
 
 # ========== USER CONFIGURATION SECTION ==========
@@ -32,6 +34,9 @@ etcdir      = @sysconfdir@
 # location of man pages
 mandir      = @mandir@
 
+# RPM build root
+rpmdir      = @rpmdir@
+
 # location of incoming mail
 mailspool   = @mailspool@
 
@@ -69,8 +74,8 @@ INSTALL_DATA    = @INSTALL_DATA@
 
 # all files in this directory included in the distribution
 DIST = ChangeLog COPYRIGHT DATE INSTALL MACHINES README VERSION                \
-       ChangeLog install-sh mkinstalldirs Makefile.in aclocal.m4       \
-       acconfig.h config.h.in configure.in configure stamp-h.in        \
+       ChangeLog install-sh mkinstalldirs Makefile.in  \
+       config.h.in configure.ac configure stamp-h.in   \
        config.sub config.guess
 
 # subdirectories in distribution
@@ -106,6 +111,7 @@ superclean:  superclean-recursive  superclean-local
 
 mostlyclean-local:
        rm -f *~
+       $(RM) -r autom4te.cache
 
 clean-local: mostlyclean-local
 
@@ -139,7 +145,7 @@ Makefile: Makefile.in config.status
 config.status: configure VERSION
        ./config.status --recheck
 
-configure: configure.in aclocal.m4
+configure: configure.ac
        cd $(srcdir) && autoconf
 
 config.h: stamp-h
@@ -147,7 +153,7 @@ stamp-h: config.h.in config.status
        ./config.status config.h stamp
 
 config.h.in: stamp-h.in
-stamp-h.in: configure.in acconfig.h aclocal.m4
+stamp-h.in: configure.ac
        cd $(srcdir) && autoheader
        date > $@
 
@@ -196,18 +202,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