Install scripts with INSTALL_SCRIPT so INSTALL_PROGRAM can be set to

'install -s' without it causing the installation of the scripts to fail.

diff --git a/ChangeLog b/ChangeLog
index 7dfd16a..8439478 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-04  Peter Maydell <pmaydell@chiark.greenend.org.uk>
+
+       * 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 <levinedl@acm.org>
 
        * uip/sendsbr.c: replaced st_mtim with st_mtime, that's what

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 8fb3ea2..66e42ad 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -23,6 +23,7 @@ smtpservers = @smtpservers@
 
 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 @@ STATIC_FILES =  MailAliases components digestcomps distcomps forwcomps        \
 # 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: install-bin-files install-etc-files
 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: