Use a new variable, $(INSTALL_SCRIPT) to install scripts, so they

won't get stripped when someone does "make install-strip".

ticket: new
tags: pullup
target_version: 1.3.6
component: krb5-build

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16767 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e1ff2a60cbfa5ffaef0a36f655d42ab39fc76d8..82ae263cc909d59b599be1a48c39ed848f7741f8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-17  Tom Yu  <tlyu@mit.edu>
 
+       * Makefile.in (install-unix): Use $(INSTALL_SCRIPT) for scripts.
+
        * aclocal.m4 (AC_LIBRARY_NET): Look for res_search() prototype,
        then for symbol in library, in case there's symbol renaming
        happening in the headers.  Clean up some style nits.

diff --git a/src/Makefile.in b/src/Makefile.in
index ad5316de2d4a0ee1dbc223ec90caed879b40a21c..8820b517ba256097831a41dab2d5d541aea7f916 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -543,7 +543,7 @@ install-windows::
        @if exist "$(KRB_INSTALL_DIR)\lib\krb4_32.lib" del "$(KRB_INSTALL_DIR)\lib\krb4_32.lib"
 
 install-unix:: 
-       $(INSTALL) krb5-config \
+       $(INSTALL_SCRIPT) krb5-config \
                $(DESTDIR)$(CLIENT_BINDIR)/krb5-config
        $(INSTALL_DATA) $(srcdir)/krb5-config.M $(DESTDIR)$(CLIENT_MANDIR)/krb5-config.1
 

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index ef4a6403961b6351f20a31314dcd39131d55deba..b38ba5593fedce4a8cc2ef8aff3363959e641ec1 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-17  Tom Yu  <tlyu@mit.edu>
+
+       * pre.in (INSTALL_SCRIPT): New variable; use to install scripts,
+       as we don't want to strip scripts.
+
 2004-08-19  Sam Hartman  <hartmans@mit.edu>
 
        * shlib.conf: Add support for gnu hurd and for BSD kernels with

diff --git a/src/config/pre.in b/src/config/pre.in
index 9409a3ed636a173612d3e0cda05eee2627c1426b..79a0891293dffe320b8b86531533cc724f57d2e7 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -177,6 +177,7 @@ CLNTDEPLIBS = @CLNTDEPLIBS@
 INSTALL=@INSTALL@
 INSTALL_STRIP=
 INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
+INSTALL_SCRIPT=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
 INSTALL_SHLIB=@INSTALL_SHLIB@
 INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 76401ea6644cc0f8ef154d1adca296ca14d7a1b3..1fe06ba3e555c6a0049985a8fce40ee76547e8fc 100644 (file)
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-17  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (install): Use $(INSTALL_SCRIPT) for scripts.
+
 2004-07-16  Ken Raeburn  <raeburn@mit.edu>
 
        * kadmin.M: Put space after ".B" directive.

diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index 64003c16eecc9b46d9f982cfae1c444b0875484c..d1b9b9bf02ebaa2389001316f7382d30a391497d 100644 (file)
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -23,7 +23,7 @@ kadmin_ct.o: kadmin_ct.c
 install::
        $(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local
        $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
-       $(INSTALL_PROGRAM) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil
+       $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil
        $(INSTALL_DATA) $(srcdir)/k5srvutil.M ${DESTDIR}$(ADMIN_MANDIR)/k5srvutil.8
        $(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8
        $(INSTALL_DATA) $(srcdir)/$(PROG).local.M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).local.8