From 1d86adfddba0d4378733e0ad32054308d7078f43 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 17 Sep 2004 20:25:06 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 2 ++ src/Makefile.in | 2 +- src/config/ChangeLog | 5 +++++ src/config/pre.in | 1 + src/kadmin/cli/ChangeLog | 4 ++++ src/kadmin/cli/Makefile.in | 2 +- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7e1ff2a60..82ae263cc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2004-09-17 Tom Yu + * 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 ad5316de2..8820b517b 100644 --- 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 ef4a64039..b38ba5593 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Tom Yu + + * pre.in (INSTALL_SCRIPT): New variable; use to install scripts, + as we don't want to strip scripts. + 2004-08-19 Sam Hartman * 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 9409a3ed6..79a089129 100644 --- 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 76401ea66..1fe06ba3e 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,7 @@ +2004-09-17 Tom Yu + + * Makefile.in (install): Use $(INSTALL_SCRIPT) for scripts. + 2004-07-16 Ken Raeburn * kadmin.M: Put space after ".B" directive. diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index 64003c16e..d1b9b9bf0 100644 --- 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 -- 2.26.2