pull up r21966, r22042 from trunk

 ------------------------------------------------------------------------
 r22042 | rra | 2009-02-20 13:48:26 -0500 (Fri, 20 Feb 2009) | 5 lines
 Changed paths:
    M /trunk/src/kadmin/cli/Makefile.in

 Ticket: 6348
 Tags: pullup

 Also install k5srvutil into PREFIX/bin instead of PREFIX/sbin.

 ------------------------------------------------------------------------
 r21966 | rra | 2009-02-11 00:00:24 -0500 (Wed, 11 Feb 2009) | 6 lines
 Changed paths:
    M /trunk/src/kadmin/cli/Makefile.in
    M /trunk/src/kadmin/ktutil/Makefile.in

 Ticket: 6348
 Tags: pullup

 Install ktutil and kadmin into CLIENT_BINDIR instead of ADMIN_BINDIR
 since both are useful for users other than the system administrator.

 ------------------------------------------------------------------------

ticket: 6348
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22206 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index a13d8599cf89fdf64efdfa2d1fc37f9d56783838..bfde8141d92aafd71ce382c19a2180a2b8ab2258 100644 (file)
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -28,8 +28,8 @@ kadmin_ct.o: kadmin_ct.c
 
 install::
        $(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local
-       $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
-       $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(ADMIN_BINDIR)/k5srvutil
+       $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(CLIENT_BINDIR)/$(PROG)
+       $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(CLIENT_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

diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index d44f5eac0fa3dc2ffae847c9baaaa509fcc7a082..e4ac4d72fd364e2fb60df6268457a80009580cbd 100644 (file)
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -20,7 +20,7 @@ ktutil: ktutil.o $(OBJS) $(SS_DEPLIB) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o ktutil $(OBJS) $(SS_LIB) $(KRB5_BASE_LIBS)
 
 install::
-       $(INSTALL_PROGRAM) ktutil ${DESTDIR}$(ADMIN_BINDIR)/ktutil
+       $(INSTALL_PROGRAM) ktutil ${DESTDIR}$(CLIENT_BINDIR)/ktutil
        $(INSTALL_DATA) $(srcdir)/ktutil.M ${DESTDIR}$(ADMIN_MANDIR)/ktutil.8
 
 generate-files-mac: ktutil_ct.c