svn rev #22206: branches/krb5-1-7/src/kadmin/ cli/ ktutil/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22206
Commit By: tlyu
Log Message:
ticket: 6348
version_fixed: 1.7

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.

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


Changed Files:
U   branches/krb5-1-7/src/kadmin/cli/Makefile.in
U   branches/krb5-1-7/src/kadmin/ktutil/Makefile.in
Modified: branches/krb5-1-7/src/kadmin/cli/Makefile.in
===================================================================
--- branches/krb5-1-7/src/kadmin/cli/Makefile.in	2009-04-13 20:26:30 UTC (rev 22205)
+++ branches/krb5-1-7/src/kadmin/cli/Makefile.in	2009-04-13 20:26:33 UTC (rev 22206)
@@ -28,8 +28,8 @@
 
 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

Modified: branches/krb5-1-7/src/kadmin/ktutil/Makefile.in
===================================================================
--- branches/krb5-1-7/src/kadmin/ktutil/Makefile.in	2009-04-13 20:26:30 UTC (rev 22205)
+++ branches/krb5-1-7/src/kadmin/ktutil/Makefile.in	2009-04-13 20:26:33 UTC (rev 22206)
@@ -20,7 +20,7 @@
 	$(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