Eliminate '#ifdef HAVE_FOO' for Posix-mandated FOOs.

[mmh] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b331c5d..39e027b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for top level of nmh distribution
 #
-# $Id$
-#
 
 # nmh version
 VERSION = @VERSION@
@@ -11,6 +9,7 @@ SHELL = /bin/sh
 @SET_MAKE@
 
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
 VPATH  = @srcdir@
 
 # ========== USER CONFIGURATION SECTION ==========
@@ -34,6 +33,9 @@ etcdir      = @sysconfdir@
 # location of man pages
 mandir      = @mandir@
 
+# RPM build root
+rpmdir      = @rpmdir@
+
 # location of incoming mail
 mailspool   = @mailspool@
 
@@ -48,7 +50,7 @@ default_pager = @pagerpath@
 
 CC       = @CC@
 CPPFLAGS = @CPPFLAGS@
-DEFS     = @DEFS@
+DEFS     = @DEFS@ @OURDEFS@
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@
 LIBS     = @LIBS@
@@ -70,12 +72,13 @@ INSTALL_DATA    = @INSTALL_DATA@
 .SUFFIXES:
 
 # all files in this directory included in the distribution
-DIST = ChangeLog COPYRIGHT INSTALL MACHINES README VERSION ChangeLog install-sh\
-       mkinstalldirs Makefile.in aclocal.m4 acconfig.h config.h.in \
-       configure.in configure stamp-h.in config.sub config.guess 
+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        \
+       config.sub config.guess
 
 # subdirectories in distribution
-SUBDIRS = h config sbr zotnet mts uip etc man docs
+SUBDIRS = h config sbr mts uip etc man docs
 
 # ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
@@ -87,7 +90,12 @@ all-recursive:
          (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
        done
 
-install uninstall:
+install: all
+       for subdir in $(SUBDIRS); do \
+         (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
+       done
+
+uninstall:
        for subdir in $(SUBDIRS); do \
          (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
        done
@@ -107,6 +115,7 @@ clean-local: mostlyclean-local
 
 distclean-local: clean-local
        rm -f Makefile config.h config.status config.log config.cache stamp-h distname
+       $(RM) -r RPM
 
 realclean-local: distclean-local
 
@@ -129,7 +138,7 @@ lint:
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 Makefile: Makefile.in config.status
-       CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+       ./config.status $@
 
 config.status: configure VERSION
        ./config.status --recheck
@@ -139,7 +148,7 @@ configure: configure.in aclocal.m4
 
 config.h: stamp-h
 stamp-h: config.h.in config.status
-       CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
+       ./config.status config.h stamp
 
 config.h.in: stamp-h.in
 stamp-h.in: configure.in acconfig.h aclocal.m4
@@ -191,3 +200,15 @@ nmhrelease:
        cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz
        cd $(ftpdir) && md5sum *.gz > MD5SUM
 
+# 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' \
+          -ba $(rpmdir)/SPECS/nmh.spec