[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 83830a24b2d6d071acd117873cbe7d247ecc36a2

[David Levine]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  83830a24b2d6d071acd117873cbe7d247ecc36a2 (commit)
      from  f57e68f247d93f60d2be2cbdf9780aa159d0335a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=83830a24b2d6d071acd117873cbe7d247ecc36a2


commit 83830a24b2d6d071acd117873cbe7d247ecc36a2
Author: David Levine <address@hidden>
Date:   Mon Dec 12 22:25:52 2011 -0600

    The docs/Makefile install target didn't do anything before.  Added
    the files that go into doc to it, and removed them from nmh.spec.
    nmh.spec should now require zero maintenance.

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 695bdf0..c9c0346 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -4,15 +4,20 @@
 
 SHELL = /bin/sh
 
+top_srcdir = @top_srcdir@
 srcdir = @srcdir@
+docdir = @docdir@
 VPATH  = @srcdir@
 
-# header files included in distribution
-FILES = COMPLETION-BASH COMPLETION-TCSH COMPLETION-ZSH               \
-        ChangeLog_MH-3_to_MH-6.6 ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
-        DIFFERENCES FAQ MAIL.FILTERING MAILING-LISTS README.about    \
-        README-ATTACHMENTS README-HOOKS README.SASL                  \
-        README.developers README.manpages TODO
+# files included in distribution
+TOPDIR_FILES_TO_INSTALL = COPYRIGHT VERSION
+FILES_TO_INSTALL = COMPLETION-BASH COMPLETION-TCSH COMPLETION-ZSH \
+                   DIFFERENCES FAQ MAIL.FILTERING MAILING-LISTS   \
+                   README-ATTACHMENTS README-HOOKS README.about   \
+                   README.SASL README.developers README.manpages  \
+                   TODO
+FILES = $(FILES_TO_INSTALL) \
+        ChangeLog_MH-3_to_MH-6.6 ChangeLog_MH-6.7.0_to_MH-6.8.4.html
 
 # auxiliary files
 AUX = Makefile.in
@@ -20,13 +25,26 @@ AUX = Makefile.in
 # all files in this directory included in the distribution
 DIST = $(FILES) $(AUX)
 
+INSTALL         = @INSTALL@
+INSTALL_DATA    = @INSTALL_DATA@
+
 # ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
 all:
 
-install:
+install: all
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+       for file in $(TOPDIR_FILES_TO_INSTALL); do \
+         $(INSTALL_DATA) $(top_srcdir)/$$file $(DESTDIR)$(docdir); \
+       done
+       for file in $(FILES_TO_INSTALL); do \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
+       done
 
 uninstall:
+       for file in $(TOPDIR_FILES_TO_INSTALL) $(FILES_TO_INSTALL); do \
+         $(RM) $(DESTDIR)$(docdir)/$$file; \
+       done
 
 lint:
 
@@ -50,11 +68,10 @@ subdir = docs
 
 Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
- 
+
 distdir = ../`cat ../distname`/$(subdir)
-nmhdist: 
+nmhdist:
        @echo "Copying distribution files in $(subdir)"
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \
        done
-
diff --git a/nmh.spec b/nmh.spec
index 858db2b..998f53a 100644
--- a/nmh.spec
+++ b/nmh.spec
@@ -40,25 +40,18 @@ cp -p %srcdir/%tarfile $RPM_SOURCE_DIR
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT doc
 (cd %srcdir  &&  make install DESTDIR=$RPM_BUILD_ROOT SETGID_MAIL=)
-find $RPM_BUILD_ROOT ! -type d -print | sed "s#^$RPM_BUILD_ROOT##g" > nmh_files
-
-#### Should do the following with an install target in docs/Makefile.
-#### These are excluded from nmh_files above because they're added
-#### with doc's in the %files section below.
-mkdir -p docs
-cp -p %srcdir/VERSION %srcdir/COPYRIGHT .
-for i in COMPLETION-* DIFFERENCES FAQ MAIL.FILTERING README* TODO; do
-  cp -p %srcdir/docs/$i docs
-done
+#### Exclude docs from nmh_files because its files are added with the
+#### %doc directive in the %files section below.
+mv `find $RPM_BUILD_ROOT -type d -name doc` .
+find $RPM_BUILD_ROOT ! -type d -print | sed "s#^$RPM_BUILD_ROOT##" > nmh_files
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%tarfile nmh_files docs COPYRIGHT 
VERSION
+rm -rf $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%tarfile nmh_files doc
 
 
 %files -f nmh_files
 %defattr(-,root,root,-)
-%doc docs/COMPLETION-* docs/DIFFERENCES docs/FAQ docs/MAIL.FILTERING
-%doc docs/README* docs/TODO COPYRIGHT VERSION
+%doc doc/*

-----------------------------------------------------------------------

Summary of changes:
 docs/Makefile.in |   37 +++++++++++++++++++++++++++----------
 nmh.spec         |   21 +++++++--------------
 2 files changed, 34 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System