[Nmh-commits] nmh etc/Makefile.in ./ChangeLog

[Peter Maydell]

CVSROOT:        /cvsroot/nmh
Module name:    nmh
Branch:         
Changes by:     Peter Maydell <address@hidden>  06/03/04 22:14:18

Modified files:
        etc            : Makefile.in 
        .              : ChangeLog 

Log message:
        Install scripts with INSTALL_SCRIPT so INSTALL_PROGRAM can be set to
        'install -s' without it causing the installation of the scripts to fail.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/etc/Makefile.in.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/ChangeLog.diff?tr1=1.239&tr2=1.240&r1=text&r2=text

Patches:
Index: nmh/ChangeLog
diff -u nmh/ChangeLog:1.239 nmh/ChangeLog:1.240
--- nmh/ChangeLog:1.239 Sat Feb 25 14:14:06 2006
+++ nmh/ChangeLog       Sat Mar  4 22:14:18 2006
@@ -1,3 +1,10 @@
+2006-03-04  Peter Maydell <address@hidden>
+
+       * etc/Makefile.in: use INSTALL_SCRIPT to install scripts;
+       this allows INSTALL_PROGRAM to be set to 'install -s' so
+       binaries are stripped on installation. Apparently the BSDs
+       do this.
+
 2006-02-25  David Levine <address@hidden>
 
        * uip/sendsbr.c: replaced st_mtim with st_mtime, that's what
Index: nmh/etc/Makefile.in
diff -u nmh/etc/Makefile.in:1.15 nmh/etc/Makefile.in:1.16
--- nmh/etc/Makefile.in:1.15    Tue Nov  8 16:58:08 2005
+++ nmh/etc/Makefile.in Sat Mar  4 22:14:18 2006
@@ -1,7 +1,7 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id: Makefile.in,v 1.15 2005/11/08 16:58:08 opk Exp $
+# $Id: Makefile.in,v 1.16 2006/03/04 22:14:18 pm215 Exp $
 #
 
 SHELL = /bin/sh
@@ -23,6 +23,7 @@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA    = @INSTALL_DATA@
 
 # Path to search for programs to handle MIME
@@ -48,7 +49,9 @@
 # templates and scripts from which non-static files are generated
 GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh mts.conf.in sendfiles.in
 
-# scripts generated using above GENERATED_FILE_SRCs
+# scripts generated using above GENERATED_FILE_SRCs; don't add binaries
+# to this list, as they'll get installed with INSTALL_SCRIPT and won't
+# be stripped.
 GENERATED_BIN_FILES = sendfiles
 
 # non-scripts generated using above GENERATED_FILE_SRCs
@@ -85,7 +88,7 @@
 install-bin-files:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        for script in $(GENERATED_BIN_FILES); do \
-         $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
+         $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
        done
 
 install-etc-files: