more make install fixes

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a755d8080681b8670d3fde32d8f56167c8306a5..f13418814d1f266f1e5c1e37f2e2076c13e81251 100644 (file)
--- 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 df674befeaedc58c93cd9d41321fae0a4ae383c1..dcaba9be10b1d3129a42d264fb046d0b671dcf04 100644 (file)
--- 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 f4e40ccec24d1b5befb1261b79ff68389644f397..3fb426a6ecf924a3ec1e156d8436c2066ff751d2 100644 (file)
--- 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 c6715e6bdfa337e50c3d5d8ea9f35f4e33728f7f..751fb0bb1265515d2308e1b913c10887c3d0cf27 100644 (file)
--- 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 d20e9f984e9e256fbfc783066cc52ac06bca84d4..f4e8bb3e96f2fcd3ca93403d3516fd440ddf3821 100644 (file)
--- 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 4ed31170024f6a23869d99c71bd97094dd41bd9d..1f544cb4120d64695fa181fe77397a9c4a692466 100644 (file)
--- 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 bbe0786e43d557725e7c0d7334c39cbcbb2905fc..c440a6186a907362fd56544d36b9616208684192 100644 (file)
--- 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 a6a59f9e608fd900446b3ffc78aa76a1d7bbfa46..eb31e6da7a85fbeb0c07400f684ce79240513376 100644 (file)
--- 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 7250cc2dd620cbff7b245e9a6a57de9d412b4c14..deb3819aa022f60b907c462a11be16d27b6e5c42 100644 (file)
--- 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 ac6138d69a3e7fcf6aa5c47592cd87fec59568be..f3d735a74e02a285640722f2f01430ca3caf044b 100644 (file)
--- 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 787b10b8d87c4210d8abc914f7dd57263c45c007..0cbedea275772b1f8486350eb67ffc588d99dd77 100644 (file)
--- 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 f5d211ccfd7a02306b145b180b22ca08ff8a2871..c87e036ffc0f8066e5ad38decb1a9f2e11ba6ecc 100644 (file)
--- 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 7f2535c7443dce74d1862977e7820db283fd8b93..4d5cde70efe9264cb74c226f1387eb629c9cd63c 100644 (file)
--- 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 df4bffa68edd67d6a7ae858367b4c5b3b3daec30..d9771ca5c8036a8da65fd380e001dd773d45ef8b 100644 (file)
--- 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 a03cebed7904d0dfb27b24e304f772a5d79ec7c0..75c291764e48c603de2a6132e11268b29993d614 100644 (file)
--- 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 351481758948458d79751021b23cb83d9d191526..385d1b446c7e1ba97f616e99a31deb7e5e52d1c6 100644 (file)
--- 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 a55a49ebdaf60cd6714b657e293e5546680e5d55..8346ea3d1edcd5545392e59da6c0a6f895df3f80 100644 (file)
--- 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 1a7745dd9b20a513df7ef2ab27b238f8dc9043df..01c07429fc4f3a9110b3e059521361e5fa813b9b 100644 (file)
--- 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 0e5d57bd9bb0ac33a54d04f60992198368338c16..3cfd79e9f58f85806c8ccf5c70428be6f66c9182 100644 (file)
--- 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 0463abdfbbab598884cb9bc740d9994477d7692b..57976bc6f156bf03c07ada85acdfea55fe0845a8 100644 (file)
--- 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 f73131767c8da85d6690de01c3b20b2f0ad7ee0e..5661c523f0dccdf51787fd383e6b8baafeabb4fe 100644 (file)
--- 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 442d7af3b414b2dec5746f0a529aef4c395017f6..186e16c241263010c9306f17d1bb6a6ac29dfbb8 100644 (file)
--- 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 24ad5c597deef91bb92e264d60f79405bc09cdab..a3f83ea6405a5d1e6824ebddf313fe4121d8ebd2 100644 (file)
--- 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 d640be1d5fb131d7f6a500d0d986215b3890ee42..a2b53637cf73ad9bf761d15aac8c5ca9956e528a 100644 (file)
--- 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 3187c0c3222d42589fb69d48e5e9eb37262b7d8d..e89f02c15df235b6c472b79ab81ce7225f928f5d 100644 (file)
--- 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 3f870b612a437c0927ef5a36bd09075f23fa29fc..24282e53c09c6561ddcd6ab10f97f2059f871d4a 100644 (file)
--- 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 3a304019b67e3576104c3dae9e4d0022273fa2d4..a7d7f44b02b46a1be6ad580a7ec7fea9245fac59 100644 (file)
--- 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 cbf63305c5ee0042432ec7b26a18f0e430a2e5db..ad78c15a6d22bb821204df045db0500407a26eaa 100644 (file)
--- 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 761ce209a2dec8d2a723cba5232c906a293fafcb..fcd0bfaa6692da6c60d2ca6163415f2b63dcf6bd 100644 (file)
--- 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 ab890d1d057c721905c905fd5989365a0f09df37..9cd84470275765322cd04185bf917081a7fd4ad5 100644 (file)
--- 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 1738c1149ce9ed0756a5b43de0afaf2742083311..a071754ffe55077fb143b6715729737b8f17d8d8 100644 (file)
--- 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 30f48dd28245c867398cb722a163e2954a132170..0a7ba68881f177a8b511d8ddc439194198adfebf 100644 (file)
--- 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 9261dba6597840ba5ce8d69b9a8b3384e613a5d1..ed458994ec6bca56609ccf2543bfed3f361359b4 100644 (file)
--- 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 7a6ad2b7363e22d5cd7d022715e488a0b2861a90..72d8e24b1d0751db7b99f084b3255846f45f502e 100644 (file)
--- 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 34d5a0d01e871f815f970f28a778a6001887511e..25faf6e5a1fd19bf3b7c2e218c49f9222689eea4 100644 (file)
--- 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 6d8e49d3ea648f15412e0a45ee62e9ecdfa08c6f..6d4fa288f4bbd33191ce29a1ece3552141c402b7 100644 (file)
--- 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 32d81d30ff96c21155bc1e80d2943ceab4abe543..99b009e6e13a30654eb5767e1ea220e677fa8738 100644 (file)
--- 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 ce2662c51dc9b2fa52ddb6e9e3bcc348cabfc0f4..dbd80c44bbd0c1b8fd0fdf3130fb651e1eb6cef5 100644 (file)
--- 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 eeebf2b4a5a542bd43d1341633eecf5c473bd7df..3fa4e6c24a6fe8312dffefe05c2c0e8af0904b01 100644 (file)
--- 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 85daead4dede6aa2e810736233a2defe6f8598ce..64c651f505e09e34df62292773808bf3c0e8d35d 100644 (file)
--- 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 7001a8b6da94c84d35a51d88a1fecd514b311e1f..527994ed5eff7a8c243d6fb5c417b153c93fd5c5 100644 (file)
--- 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 2938d3e39f8452352857553f2b8fe89f0639dfd2..a37d4a901c376b62f47619b4e4840df7dc1b99d9 100644 (file)
--- 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)