more make install fixes

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

11 files changed, 16 insertions, 10 deletions

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)