From fa2849a31c54bfb4ea6256aa083cc9b144091136 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 20 Jul 1994 04:29:19 +0000 Subject: [PATCH] more make install fixes git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4004 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 8 ++++ src/aclocal.m4 | 69 ++++++++++++++++++++++++++++ src/admin/aname/Makefile.in | 4 +- src/admin/aname/configure.in | 1 + src/admin/convert/Makefile.in | 4 +- src/admin/convert/configure.in | 1 + src/admin/create/configure.in | 1 + src/admin/destroy/Makefile.in | 4 +- src/admin/destroy/configure.in | 1 + src/admin/edit/Makefile.in | 4 +- src/admin/edit/configure.in | 1 + src/admin/stash/Makefile.in | 4 +- src/admin/stash/configure.in | 1 + src/appl/ChangeLog | 4 ++ src/appl/bsd/Makefile.in | 12 ++--- src/appl/bsd/configure.in | 1 + src/appl/configure.in | 2 +- src/appl/sample/sclient/Makefile.in | 4 +- src/appl/sample/sclient/configure.in | 1 + src/appl/sample/sserver/Makefile.in | 4 +- src/appl/sample/sserver/configure.in | 1 + src/appl/simple/client/Makefile.in | 2 +- src/appl/simple/client/configure.in | 1 + src/appl/simple/server/Makefile.in | 2 +- src/appl/simple/server/configure.in | 1 + src/appl/user_user/Makefile.in | 4 +- src/appl/user_user/configure.in | 1 + src/clients/kdestroy/Makefile.in | 4 +- src/clients/kdestroy/configure.in | 1 + src/clients/kinit/Makefile.in | 4 +- src/clients/kinit/configure.in | 1 + src/clients/klist/Makefile.in | 4 +- src/clients/klist/configure.in | 1 + src/config/pre.in | 3 ++ src/kadmin/client/Makefile.in | 4 +- src/kadmin/client/configure.in | 1 + src/kadmin/kpasswd/Makefile.in | 4 +- src/kadmin/kpasswd/configure.in | 1 + src/kdc/Makefile.in | 4 +- src/kdc/configure.in | 1 + src/slave/Makefile.in | 8 ++-- src/slave/configure.in | 1 + 42 files changed, 144 insertions(+), 41 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5a755d808..f13418814 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +Wed Jul 20 00:00:00 1994 Tom Yu (tlyu at dragons-lair) + + * Makefile.in (in all relevant subdirs): + * configure.in (in all relevant subdirs): changes to fix make + install + * aclocal.m4: make changes to look for install.sh in the right + places + Mon Jul 11 23:32:51 1994 Tom Yu (tlyu at dragons-lair) * aclocal.m4: cleaning up stuff to not echo things like "if diff --git a/src/aclocal.m4 b/src/aclocal.m4 index df674befe..dcaba9be1 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -469,3 +469,72 @@ dnl allow for compilation with isode (yuck!) dnl define(ISODE_DEFS, [AC_ENABLE([isode],[ADD_DEF(KRB5_USE_ISODE)],)])dnl +undefine([AC_PROG_INSTALL])dnl +define(AC_PROG_INSTALL, +[# Make sure to not get the incompatible SysV /etc/install and +# /usr/sbin/install, which might be in PATH before a BSD-like install, +# or the SunOS /usr/etc/install directory, or the AIX /bin/install, +# or the AFS install, which mishandles nonexistent args, or +# /usr/ucb/install on SVR4, which tries to use the nonexistent group +# `staff', or /sbin/install on IRIX which has incompatible command-line +# syntax. Sigh. +# +# On most BSDish systems install is in /usr/bin, not /usr/ucb +# anyway. +# This turns out not to be true, so the mere pathname isn't an indication +# of whether the program works. What we really need is a set of tests for +# the install program to see if it actually works in all the required ways. +# +# Avoid using ./install, which might have been erroneously created +# by make from ./install.sh. +if test -z "${INSTALL}"; then + AC_CHECKING(for a BSD compatible install) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + case "$ac_dir" in + ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + for ac_prog in installbsd scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. + : + else + INSTALL="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_ifs" +fi + +if test -z "$INSTALL"; then + # As a last resort, use the slow shell script. + for ac_dir in ${srcdir} ${srcdir}/.. ${srcdir}/../.. ${srcdir}/AC_TOPDIR/util/autoconf; do + if test -f $ac_dir/install.sh; then + INSTALL="$ac_dir/install.sh -c"; break + fi + done +fi +if test -z "$INSTALL"; then + AC_ERROR([can not find install.sh in ${srcdir} or ${srcdir}/.. or ${srcdir}/../.. ${srcdir}/AC_TOPDIR/util/autoconf]) +fi +AC_SUBST(INSTALL)dnl +AC_VERBOSE(setting INSTALL to $INSTALL) + +# Use test -z because SunOS4 sh mishandles ${INSTALL_PROGRAM-'${INSTALL}'}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +AC_SUBST(INSTALL_PROGRAM)dnl +AC_VERBOSE(setting INSTALL_PROGRAM to $INSTALL_PROGRAM) + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +AC_SUBST(INSTALL_DATA)dnl +AC_VERBOSE(setting INSTALL_DATA to $INSTALL_DATA) +])dnl diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in index f4e40ccec..3fb426a6e 100644 --- a/src/admin/aname/Makefile.in +++ b/src/admin/aname/Makefile.in @@ -20,8 +20,8 @@ kdb5_anadd: kdb5_anadd.o $(DEPLIBS) $(CC) $(CFLAGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS) install:: - cp kdb5_anadd $(DESTDIR)$(ADMIN_BINDIR)/kdb5_anadd - cp kdb5_anadd.M $(DESTDIR)$(ADMIN_MANDIR)/kdb5_anadd.8 + $(INSTALL_PROGRAM) kdb5_anadd $(DESTDIR)$(ADMIN_BINDIR)/kdb5_anadd + $(INSTALL_DATA) kdb5_anadd.M $(DESTDIR)$(ADMIN_MANDIR)/kdb5_anadd.8 clean:: $(RM) kdb5_anadd kdb5_anadd.o diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in index c6715e6bd..751fb0bb1 100644 --- a/src/admin/aname/configure.in +++ b/src/admin/aname/configure.in @@ -2,6 +2,7 @@ AC_INIT(kdb5_anadd.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(-lndbm) diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in index d20e9f984..f4e8bb3e9 100644 --- a/src/admin/convert/Makefile.in +++ b/src/admin/convert/Makefile.in @@ -25,8 +25,8 @@ kdb5_convert: kdb5_convert.o $(DEPLIBS) $(CC) $(CFLAGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS) install:: - cp kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert - cp kdb5_convert.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_convert.8 + $(INSTALL_PROGRAM) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert + $(INSTALL_DATA) kdb5_convert.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_convert.8 clean:: $(RM) kdb5_convert kdb5_convert.o diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in index 4ed311700..1f544cb41 100644 --- a/src/admin/convert/configure.in +++ b/src/admin/convert/configure.in @@ -2,6 +2,7 @@ AC_INIT(kdb5_convert.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(-lndbm) diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in index bbe0786e4..c440a6186 100644 --- a/src/admin/create/configure.in +++ b/src/admin/create/configure.in @@ -3,6 +3,7 @@ WITH_CCOPTS CONFIG_RULES WITH_KRB5ROOT AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(-lndbm) diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in index a6a59f9e6..eb31e6da7 100644 --- a/src/admin/destroy/Makefile.in +++ b/src/admin/destroy/Makefile.in @@ -20,8 +20,8 @@ kdb5_destroy: kdb5_destroy.o $(DEPLIBS) $(CC) $(CFLAGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS) install:: - cp kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy - cp kdb5_destroy.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_destroy.8 + $(INSTALL_PROGRAM) kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy + $(INSTALL_DATA) kdb5_destroy.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_destroy.8 clean:: $(RM) kdb5_destroy kdb5_destroy.o diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in index 7250cc2dd..deb3819aa 100644 --- a/src/admin/destroy/configure.in +++ b/src/admin/destroy/configure.in @@ -2,6 +2,7 @@ AC_INIT(kdb5_destroy.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(-lndbm) diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in index ac6138d69..f3d735a74 100644 --- a/src/admin/edit/Makefile.in +++ b/src/admin/edit/Makefile.in @@ -24,8 +24,8 @@ kdb5_edit: kdb5_edit.o $(DEPLIBS) $(OBJS) $(CC) $(CFLAGS) -o kdb5_edit $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) install:: - cp kdb5_edit ${DESTDIR}$(ADMIN_BINDIR)/kdb5_edit - cp kdb5_edit.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_edit.8 + $(INSTALL_PROGRAM) kdb5_edit ${DESTDIR}$(ADMIN_BINDIR)/kdb5_edit + $(INSTALL_DATA) kdb5_edit.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_edit.8 # needed until we run makedepend kdb5_ed_ct.c: kdb5_ed_ct.ct diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index 787b10b8d..0cbedea27 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -2,6 +2,7 @@ AC_INIT(kdb5_edit.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(-lndbm) diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in index f5d211ccf..c87e036ff 100644 --- a/src/admin/stash/Makefile.in +++ b/src/admin/stash/Makefile.in @@ -20,8 +20,8 @@ kdb5_stash: kdb5_stash.o $(DEPLIBS) $(CC) $(CFLAGS) -o kdb5_stash kdb5_stash.o $(LOCAL_LIBRARIES) $(LIBS) install:: - cp kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash - cp kdb5_stash.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_stash.8 + $(INSTALL_PROGRAM) kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash + $(INSTALL_DATA) kdb5_stash.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_stash.8 clean:: $(RM) kdb5_stash kdb5_stash.o diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in index 7f2535c74..4d5cde70e 100644 --- a/src/admin/stash/configure.in +++ b/src/admin/stash/configure.in @@ -2,6 +2,7 @@ AC_INIT(kdb5_stash.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(-lndbm) diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog index df4bffa68..d9771ca5c 100644 --- a/src/appl/ChangeLog +++ b/src/appl/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 20 00:10:30 1994 Tom Yu (tlyu at dragons-lair) + + * configure.in: autoconf'ing gss-sample + Thu Jul 14 02:04:07 1994 Tom Yu (tlyu at dragons-lair) * configure.in: suck in bsd now diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index a03cebed7..75c291764 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -17,34 +17,34 @@ rsh: krsh.o kcmd.o forward.o $(CC) $(CFLAGS) -o rsh krsh.o kcmd.o forward.o $(KLIB) $(LIBS) install:: - cp rsh $(DESTDIR)$(CLIENT_BINDIR)/rsh + $(INSTALL_PROGRAM) rsh $(DESTDIR)$(CLIENT_BINDIR)/rsh rcp: krcp.o kcmd.o forward.o $(CC) $(CFLAGS) -o rcp krcp.o kcmd.o forward.o $(KLIB) $(LIBS) install:: - cp rcp $(DESTDIR)$(CLIENT_BINDIR)/rcp + $(INSTALL_PROGRAM) rcp $(DESTDIR)$(CLIENT_BINDIR)/rcp rlogin: krlogin.o kcmd.o forward.o $(CC) $(CFLAGS) -o rlogin krlogin.o kcmd.o forward.o $(KLIB) $(LIBS) install:: - cp rlogin $(DESTDIR)$(CLIENT_BINDIR)/rlogin + $(INSTALL_PROGRAM) rlogin $(DESTDIR)$(CLIENT_BINDIR)/rlogin krshd: krshd.o kcmd.o logutil.o forward.o $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(KLIB) $(K4LIB) $(LIBS) install:: - cp krshd $(DESTDIR)$(SERVER_BINDIR)/krshd + $(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd krlogind: krlogind.o logutil.o kcmd.o forward.o $(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(KLIB) $(K4LIB) $(LIBS) install:: - cp krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind + $(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind login.krb5: login.o logutil.o $(SETENVOBJ) $(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(KLIB) $(LIBS) install:: - cp login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5 + $(INSTALL_PROGRAM) login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5 diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 351481758..385d1b446 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -4,6 +4,7 @@ ISODE_DEFS ISODE_INCLUDE CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_FUNC_CHECK(utimes,AC_DEFINE(HAS_UTIMES)) diff --git a/src/appl/configure.in b/src/appl/configure.in index a55a49ebd..8346ea3d1 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP -CONFIG_DIRS(sample simple user_user bsd) +CONFIG_DIRS(sample simple user_user bsd gss-sample) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index 1a7745dd9..01c07429f 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -21,5 +21,5 @@ clean:: $(RM) sclient.o sclient install:: - cp sclient ${DESTDIR}$(CLIENT_BINDIR)/sclient - cp sclient.M ${DESTDIR}$(CLIENT_MANDIR)/sclient.1 + $(INSTALL_PROGRAM) sclient ${DESTDIR}$(CLIENT_BINDIR)/sclient + $(INSTALL_DATA) sclient.M ${DESTDIR}$(CLIENT_MANDIR)/sclient.1 diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in index 0e5d57bd9..3cfd79e9f 100644 --- a/src/appl/sample/sclient/configure.in +++ b/src/appl/sample/sclient/configure.in @@ -2,6 +2,7 @@ AC_INIT(sclient.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) KRB_INCLUDE diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index 0463abdfb..57976bc6f 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -21,5 +21,5 @@ clean:: $(RM) sserver.o sserver install:: - cp sserver ${DESTDIR}$(SERVER_BINDIR)/sserver - cp sserver.M ${DESTDIR}$(SERVER_MANDIR)/sserver.8 + $(INSTALL_PROGRAM) sserver ${DESTDIR}$(SERVER_BINDIR)/sserver + $(INSTALL_DATA) sserver.M ${DESTDIR}$(SERVER_MANDIR)/sserver.8 diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in index f73131767..5661c523f 100644 --- a/src/appl/sample/sserver/configure.in +++ b/src/appl/sample/sserver/configure.in @@ -2,6 +2,7 @@ AC_INIT(sserver.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) KRB_INCLUDE diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in index 442d7af3b..186e16c24 100644 --- a/src/appl/simple/client/Makefile.in +++ b/src/appl/simple/client/Makefile.in @@ -19,7 +19,7 @@ sim_client.o: $(srcdir)/sim_client.c all:: sim_client install:: - cp sim_client $(DESTDIR)$(CLIENT_BINDIR)/sim_client + $(INSTALL_PROGRAM) sim_client $(DESTDIR)$(CLIENT_BINDIR)/sim_client clean:: $(RM) sim_client.o sim_client diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in index 24ad5c597..a3f83ea64 100644 --- a/src/appl/simple/client/configure.in +++ b/src/appl/simple/client/configure.in @@ -2,6 +2,7 @@ AC_INIT(sim_client.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) KRB_INCLUDE diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in index d640be1d5..a2b53637c 100644 --- a/src/appl/simple/server/Makefile.in +++ b/src/appl/simple/server/Makefile.in @@ -19,7 +19,7 @@ sim_server.o: $(srcdir)/sim_server.c all:: sim_server install:: - cp sim_server $(DESTDIR)$(SERVER_BINDIR)/sim_server + $(INSTALL_PROGRAM) sim_server $(DESTDIR)$(SERVER_BINDIR)/sim_server clean:: diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in index 3187c0c32..e89f02c15 100644 --- a/src/appl/simple/server/configure.in +++ b/src/appl/simple/server/configure.in @@ -2,6 +2,7 @@ AC_INIT(sim_server.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) KRB_INCLUDE diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index 3f870b612..24282e53c 100644 --- a/src/appl/user_user/Makefile.in +++ b/src/appl/user_user/Makefile.in @@ -28,8 +28,8 @@ server.o: $(srcdir)/server.c all:: uuserver install:: - cp uuclient $(DESTDIR)$(CLIENT_BINDIR)/uuclient - cp uuserver $(DESTDIR)$(SERVER_BINDIR)/uusrever + $(INSTALL_PROGRAM) uuclient $(DESTDIR)$(CLIENT_BINDIR)/uuclient + $(INSTALL_PROGRAM) uuserver $(DESTDIR)$(SERVER_BINDIR)/uusrever clean:: $(RM) server.o uuserver diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in index 3a304019b..a7d7f44b0 100644 --- a/src/appl/user_user/configure.in +++ b/src/appl/user_user/configure.in @@ -2,6 +2,7 @@ AC_INIT(client.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) KRB_INCLUDE diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in index cbf63305c..ad78c15a6 100644 --- a/src/clients/kdestroy/Makefile.in +++ b/src/clients/kdestroy/Makefile.in @@ -21,5 +21,5 @@ clean:: $(RM) kdestroy.o kdestroy install:: - cp kdestroy ${DESTDIR}$(CLIENT_BINDIR)/kdestroy - cp kdestroy.M ${DESTDIR}$(CLIENT_MANDIR)/kdestroy.1 + $(INSTALL_PROGRAM) kdestroy ${DESTDIR}$(CLIENT_BINDIR)/kdestroy + $(INSTALL_DATA) kdestroy.M ${DESTDIR}$(CLIENT_MANDIR)/kdestroy.1 diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in index 761ce209a..fcd0bfaa6 100644 --- a/src/clients/kdestroy/configure.in +++ b/src/clients/kdestroy/configure.in @@ -1,6 +1,7 @@ AC_INIT(kdestroy.c) WITH_CCOPTS AC_SET_BUILDTOP +AC_PROG_INSTALL CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index ab890d1d0..9cd844702 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -21,5 +21,5 @@ clean:: $(RM) kinit.o kinit install:: - cp kinit ${DESTDIR}$(CLIENT_BINDIR)/kinit - cp kinit.M ${DESTDIR}$(CLIENT_MANDIR)/kinit.1 + $(INSTALL_PROGRAM) kinit ${DESTDIR}$(CLIENT_BINDIR)/kinit + $(INSTALL_DATA) kinit.M ${DESTDIR}$(CLIENT_MANDIR)/kinit.1 diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in index 1738c1149..a071754ff 100644 --- a/src/clients/kinit/configure.in +++ b/src/clients/kinit/configure.in @@ -2,6 +2,7 @@ AC_INIT(kinit.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) KRB_INCLUDE diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 30f48dd28..0a7ba6888 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -20,5 +20,5 @@ clean:: $(RM) klist.o klist install:: - cp klist ${DESTDIR}$(CLIENT_BINDIR)/klist - cp klist.M ${DESTDIR}$(CLIENT_MANDIR)/klist.1 + $(INSTALL_PROGRAM) klist ${DESTDIR}$(CLIENT_BINDIR)/klist + $(INSTALL_DATA) klist.M ${DESTDIR}$(CLIENT_MANDIR)/klist.1 diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in index 9261dba65..ed458994e 100644 --- a/src/clients/klist/configure.in +++ b/src/clients/klist/configure.in @@ -1,6 +1,7 @@ AC_INIT(klist.c) WITH_CCOPTS AC_SET_BUILDTOP +AC_PROG_INSTALL CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/config/pre.in b/src/config/pre.in index 7a6ad2b73..72d8e24b1 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -11,6 +11,9 @@ CCOPTS = @CCOPTS@ LIBS = @LIBS@ KRB5ROOT= @KRB5ROOT@ KRB4=@KRB4@ +INSTALL=@INSTALL@ +INSTALL_PROGRAM=@INSTALL_PROGRAM@ +INSTALL_DATA=@INSTALL_DATA@ KRB5MANROOT = $(KRB5ROOT)/man ADMIN_BINDIR = $(KRB5ROOT)/admin diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in index 34d5a0d01..25faf6e5a 100644 --- a/src/kadmin/client/Makefile.in +++ b/src/kadmin/client/Makefile.in @@ -45,8 +45,8 @@ kadmin: $(KDBDEPLIB) $(OBJS) $(DEBKLIB) $(CC) $(CFLAGS) -o kadmin $(OBJS) $(KLIB) $(LIBS) install:: - cp kadmin ${DESTDIR}$(CLIENT_BINDIR)/kadmin - cp kadmin.M ${DESTDIR}$(CLIENT_MANDIR)/kadmin.1 + $(INSTALL_PROGRAM) kadmin ${DESTDIR}$(CLIENT_BINDIR)/kadmin + $(INSTALL_DATA) kadmin.M ${DESTDIR}$(CLIENT_MANDIR)/kadmin.1 clean:: $(RM) kadmin diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in index 6d8e49d3e..6d4fa288f 100644 --- a/src/kadmin/client/configure.in +++ b/src/kadmin/client/configure.in @@ -2,6 +2,7 @@ AC_INIT(kadmin.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in index 32d81d30f..99b009e6e 100644 --- a/src/kadmin/kpasswd/Makefile.in +++ b/src/kadmin/kpasswd/Makefile.in @@ -29,8 +29,8 @@ kpasswd: $(KDBDEPLIB) $(OBJS) $(DEBKLIB) $(CC) $(CFLAGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS) install:: - cp kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd - cp kpasswd.M ${DESTDIR}$(CLIENT_MANDIR)/kpasswd.1 + $(INSTALL_PROGRAM) kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd + $(INSTALL_DATA) kpasswd.M ${DESTDIR}$(CLIENT_MANDIR)/kpasswd.1 clean:: $(RM) kpasswd diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in index ce2662c51..dbd80c44b 100644 --- a/src/kadmin/kpasswd/configure.in +++ b/src/kadmin/kpasswd/configure.in @@ -2,6 +2,7 @@ AC_INIT(kpasswd.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index eeebf2b4a..3fa4e6c24 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -58,8 +58,8 @@ krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB) $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KLIB) $(K4LIB) $(LIBS) install:: - cp krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc - cp krb5kdc.M ${DESTDIR}$(SERVER_MANDIR)/krb5kdc.8 + $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc + $(INSTALL_DATA) krb5kdc.M ${DESTDIR}$(SERVER_MANDIR)/krb5kdc.8 clean:: $(RM) kdc5_err.h kdc5_err.c diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 85daead4d..64c651f50 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -3,6 +3,7 @@ WITH_CCOPTS CONFIG_RULES ISODE_DEFS AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(-lndbm) diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 7001a8b6d..527994ed5 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -28,15 +28,15 @@ kprop: $(CLIENTOBJS) $(DEPLIBS) $(CC) $(CFLAGS) -o kprop $(CLIENTOBJS) $(LOCAL_LIBRARIES) $(LIBS) install:: - cp kprop ${DESTDIR}$(SERVER_BINDIR)/kprop - cp kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.8 + $(INSTALL_PROGRAM) kprop ${DESTDIR}$(SERVER_BINDIR)/kprop + $(INSTALL_DATA) kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.8 kpropd: $(SERVEROBJS) $(DEPLIBS) $(CC) $(CFLAGS) -o kpropd $(SERVEROBJS) $(LOCAL_LIBRARIES) $(LIBS) install:: - cp kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd - cp kpropd.M ${DESTDIR}$(SERVER_MANDIR)/kpropd.8 + $(INSTALL_PROGRAM) kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd + $(INSTALL_DATA) kpropd.M ${DESTDIR}$(SERVER_MANDIR)/kpropd.8 clean:: $(RM) $(CLIENTOBJS) $(SERVEROBJS) diff --git a/src/slave/configure.in b/src/slave/configure.in index 2938d3e39..a37d4a901 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -2,6 +2,7 @@ AC_INIT(kprop.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP +AC_PROG_INSTALL AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(util) -- 2.26.2