* Makefile.in

	Support --program-prefix, --program-suffix, --program-transform

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

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 7ae3e0b29f32ebf1634c95886fe8dec378555621..7104beeaa2b25d358a76328f1d0ee9be14ca0b57 100644 (file)
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -33,42 +33,41 @@ clean::
 rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
-install::
-       $(INSTALL_PROGRAM) rsh $(DESTDIR)$(CLIENT_BINDIR)/rsh
-       $(INSTALL_DATA) $(srcdir)/rsh.M ${DESTDIR}$(CLIENT_MANDIR)/rsh.1
-
 rcp: krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
-install::
-       $(INSTALL_PROGRAM) rcp $(DESTDIR)$(CLIENT_BINDIR)/rcp
-       $(INSTALL_DATA) $(srcdir)/rcp.M ${DESTDIR}$(CLIENT_MANDIR)/rcp.1
-
 rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
-       $(INSTALL_PROGRAM) rlogin $(DESTDIR)$(CLIENT_BINDIR)/rlogin
-       $(INSTALL_DATA) $(srcdir)/rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1
+       for f in rsh rcp rlogin; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done
 
 kshd: krshd.o kcmd.o  forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o kshd krshd.o kcmd.o  forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
-install::
-       $(INSTALL_PROGRAM) kshd $(DESTDIR)$(SERVER_BINDIR)/kshd
-       $(INSTALL_DATA) $(srcdir)/krshd.M ${DESTDIR}$(SERVER_MANDIR)/kshd.8
-
 klogind: krlogind.o  kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o klogind krlogind.o  kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
-       $(INSTALL_PROGRAM) klogind $(DESTDIR)$(SERVER_BINDIR)/klogind
-       $(INSTALL_DATA) $(srcdir)/krlogind.M ${DESTDIR}$(SERVER_MANDIR)/klogind.8
+       for f in kshd klogind; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(SERVER_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/krshd.M \
+               ${DESTDIR}$(SERVER_MANDIR)/`echo $$f|sed '$(transform)'`.8; \
+       done
 
 #
 # We load the libraries twice here since des425 has a dependency on 
 # krb5_read_passwrd in krb5.a.  Sigh, circular references.
 #
+# No program name transformation is done with login.krb5 since it is directly
+# referenced by klogind.
+#
 login.krb5: login.o  $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o $(SETENVOBJ) $(LIBOBJS) $(LIBS) $(LOGINLIBS)
 

diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index 06ee2daca33c0944cc99850f9032102786245612..145ddc223ad3296726897c6772a7d63fc978feb7 100644 (file)
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -30,8 +30,12 @@ clean::
 depend::
 
 install::
-       $(INSTALL_PROGRAM) ftp $(DESTDIR)$(CLIENT_BINDIR)/ftp
-       $(INSTALL_DATA) $(srcdir)/ftp.M ${DESTDIR}$(CLIENT_MANDIR)/ftp.1
+       for f in ftp; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done
 
 ftp.o cmds.o main.o:   $(srcdir)/../arpa/ftp.h
 ftp.o cmds.o cmdtab.o domacro.o main.o ruserpass.o: $(srcdir)/ftp_var.h

diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index edf174a00a05916edb22d1f8dfd5ee3a69ee7598..d1310d55e3f4722ec803c142c62b046764e9da99 100644 (file)
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -34,9 +34,12 @@ clean::
 depend::
 
 install::
-       $(INSTALL_PROGRAM) ftpd $(DESTDIR)$(SERVER_BINDIR)/ftpd
-       $(INSTALL_DATA) $(srcdir)/ftpd.M ${DESTDIR}$(SERVER_MANDIR)/ftp.8
-
+       for f in ftpd; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(SERVER_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(SERVER_MANDIR)/`echo $$f|sed '$(transform)'`.8; \
+       done
 
 ftpcmd.c: $(srcdir)/ftpcmd.y
        $(RM) ftpcmd.c y.tab.c

diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 9310dd21b0fbaf07b30328796a318edb00c4e296..0180fe63bb791e26dc8ba3baad9ee3f7d8171e1c 100644 (file)
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -45,8 +45,12 @@ clean::
        $(RM) telnet
 
 install::
-       $(INSTALL_PROGRAM) telnet $(DESTDIR)$(CLIENT_BINDIR)/telnet
-       $(INSTALL_DATA) $(srcdir)/telnet.1 ${DESTDIR}$(CLIENT_MANDIR)/telnet.1
+       for f in telnet; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.1 \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done
        $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
 
 authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)

diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 984e9a28610bdfad04ce4739c6bbdc5ee5f8cb33..533633ba32d4a56810829b721ff201e63b6607c4 100644 (file)
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -56,8 +56,12 @@ clean::
        $(RM) telnetd
 
 install::
-       $(INSTALL_PROGRAM) telnetd $(DESTDIR)$(SERVER_BINDIR)/telnetd
-       $(INSTALL_DATA) $(srcdir)/telnetd.8 ${DESTDIR}$(SERVER_MANDIR)/telnetd.8
+       for f in telnetd; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(SERVER_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.8 \
+               ${DESTDIR}$(SERVER_MANDIR)/`echo $$f|sed '$(transform)'`.8; \
+       done
 
 authenc.o: telnetd.h
 global.o: defs.h ext.h $(ARPA_TELNET)

diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index bf13ee7e3136921e8f3ca761ee6332bd4f8ca44a..f52ed283413175cd023c96983c1321293b9d85ae 100644 (file)
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -14,5 +14,9 @@ clean::
        $(RM) kdestroy.o kdestroy
 
 install::
-       $(INSTALL_PROGRAM) kdestroy ${DESTDIR}$(CLIENT_BINDIR)/kdestroy
-       $(INSTALL_DATA) $(srcdir)/kdestroy.M ${DESTDIR}$(CLIENT_MANDIR)/kdestroy.1
+       for f in kdestroy; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done

diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index 402b67283f5f6cd685a3a47be98829feade5857b..d213016229a222f7fa03a63d31906b00a98ac954 100644 (file)
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -14,5 +14,9 @@ clean::
        $(RM) kinit.o kinit
 
 install::
-       $(INSTALL_PROGRAM) kinit ${DESTDIR}$(CLIENT_BINDIR)/kinit
-       $(INSTALL_DATA) $(srcdir)/kinit.M ${DESTDIR}$(CLIENT_MANDIR)/kinit.1
+       for f in kinit; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done

diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 61e32659f3619031eb5bd08d1c12f222c525578f..3c9817904da1a0c338889568fc687750c70f503e 100644 (file)
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -13,5 +13,9 @@ clean::
        $(RM) klist.o klist
 
 install::
-       $(INSTALL_PROGRAM) klist ${DESTDIR}$(CLIENT_BINDIR)/klist
-       $(INSTALL_DATA) $(srcdir)/klist.M ${DESTDIR}$(CLIENT_MANDIR)/klist.1
+       for f in klist; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done

diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index f58c699a119ef29d3aca1147f8a13d15f235f9a2..3dbbfa3707ee781708820529970e1b6eb6299932 100644 (file)
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -23,5 +23,9 @@ clean::
        $(RM) ksu
 
 install::
-       $(INSTALL_SETUID) ksu ${DESTDIR}$(CLIENT_BINDIR)/ksu
-       $(INSTALL_DATA) $(srcdir)/ksu.M ${DESTDIR}$(CLIENT_MANDIR)/ksu.1
+       for f in ksu; do \
+         $(INSTALL_SETUID) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done

diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index aed4a7d0a0e974acc9feb33c9a56b848b7948137..8bc5cdf10f9a9e852849181cd6c2862ecc622b0d 100644 (file)
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -15,8 +15,12 @@ kpasswd: $(OBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o kpasswd $(OBJS) $(LIBS)
 
 install::
-       $(INSTALL_PROGRAM) kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd
-       $(INSTALL_DATA) $(srcdir)/kpasswd.M ${DESTDIR}$(CLIENT_MANDIR)/kpasswd.1
+       for f in kpasswd; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
+       done
 
 clean::
        $(RM) kpasswd

diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index c1b8edf9ccce280e77db6172f2df8eeaa3551d4b..aba1413fb43b0f7b10c95537b8ea5bcf921e917d 100644 (file)
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -15,16 +15,16 @@ all::       kprop kpropd
 kprop: $(CLIENTOBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o kprop $(CLIENTOBJS) $(LIBS)
 
-install::
-       $(INSTALL_PROGRAM) kprop ${DESTDIR}$(SERVER_BINDIR)/kprop
-       $(INSTALL_DATA) $(srcdir)/kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.8
-
 kpropd: $(SERVEROBJS) $(DEPLIBS)
        $(LD) $(LDFLAGS) $(LDARGS) -o kpropd $(SERVEROBJS) $(LIBS)
 
 install::
-       $(INSTALL_PROGRAM) kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd
-       $(INSTALL_DATA) $(srcdir)/kpropd.M ${DESTDIR}$(SERVER_MANDIR)/kpropd.8
+       for f in kprop kpropd; do \
+         $(INSTALL_PROGRAM) $$f \
+               $(DESTDIR)$(SERVER_BINDIR)/`echo $$f|sed '$(transform)'`; \
+         $(INSTALL_DATA) $(srcdir)/$$f.M \
+               ${DESTDIR}$(SERVER_MANDIR)/`echo $$f|sed '$(transform)'`.8; \
+       done
 
 clean::
        $(RM) $(CLIENTOBJS) $(SERVEROBJS)