updates for install stuff

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

diff --git a/src/Imakefile b/src/Imakefile
index 5f058146d72991648c7ad05a8cc29f37e2130ebd..18097eac5907cb73250df8d8abf968e9f6dbaab3 100644 (file)
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -26,6 +26,9 @@ MakeSubdirs($(SUBDIRS))
 
 depend:: includes
 
+install::
+       $(MAKE) $(MFLAGS) install.man
+
 /**/# rebuild the Makefiles in the master source tree
 mastermakefiles::
        -$(MV) Makefile Makefile.bak

diff --git a/src/admin/aname/Imakefile b/src/admin/aname/Imakefile
index a37aef22cd120a75ebcae5e36dd8de41d3f2c6dc..0df94eaafcab6c55c9812658065570dd9bc972be 100644 (file)
--- a/src/admin/aname/Imakefile
+++ b/src/admin/aname/Imakefile
@@ -11,4 +11,4 @@
 DEPLIBS = $(OSDEPLIB)
 LOCAL_LIBRARIES = $(KLIBLOC) -l$(OSLIB) $(COMERRLIB) $(DBMLIB)
 
-SimpleProgramTarget(kdb5_anadd)
+Krb5AdminProgramTarget(kdb5_anadd)

diff --git a/src/admin/create/Imakefile b/src/admin/create/Imakefile
index 0f6e09020be34391eb689218b952d2f80bea55ae..c709a3a214053b52e90c6217db81cc97f522230a 100644 (file)
--- a/src/admin/create/Imakefile
+++ b/src/admin/create/Imakefile
@@ -11,4 +11,4 @@
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
-SimpleProgramTarget(kdb5_create)
+Krb5AdminProgramTarget(kdb5_create)

diff --git a/src/admin/destroy/Imakefile b/src/admin/destroy/Imakefile
index ae3e740d95205ad1b826c3506d20cc569b73fe35..52af97d6e50ff1e68091e6453781d9a5571a8fd4 100644 (file)
--- a/src/admin/destroy/Imakefile
+++ b/src/admin/destroy/Imakefile
@@ -11,4 +11,4 @@
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
-SimpleProgramTarget(kdb5_destroy)
+Krb5AdminProgramTarget(kdb5_destroy)

diff --git a/src/admin/edit/Imakefile b/src/admin/edit/Imakefile
index 9e266531c7854d1f478308d6d236ef2498b63649..02f2530a79029c6c85def07b9fecb1ac20b049d6 100644 (file)
--- a/src/admin/edit/Imakefile
+++ b/src/admin/edit/Imakefile
@@ -24,6 +24,7 @@ clean::
        $(RM) kdb5_ed_ct.c
 
 NormalProgramTarget(kdb5_edit,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),)
+Krb5InstallAdminProgram(kdb5_edit)
 
 SaberProgramTarget(kdb5_edit,$(SRCS),$(OBJS),$(LOCAL_LIBRARIES),)
 

diff --git a/src/admin/stash/Imakefile b/src/admin/stash/Imakefile
index 3004adeda300e7099c97da7ecb6af435c8cb1bc3..97de7926c557193b24776031a0de9073e05a01ac 100644 (file)
--- a/src/admin/stash/Imakefile
+++ b/src/admin/stash/Imakefile
@@ -11,4 +11,4 @@
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
-SimpleProgramTarget(kdb5_stash)
+Krb5AdminProgramTarget(kdb5_stash)

diff --git a/src/appl/movemail/Imakefile b/src/appl/movemail/Imakefile
index 1e36a09114151844f2068531cc1bbc597b29ac7d..160141bb4969cebf99c5a9e134f1248c2ca4ca1a 100644 (file)
--- a/src/appl/movemail/Imakefile
+++ b/src/appl/movemail/Imakefile
@@ -16,4 +16,4 @@ LOCAL_LIBRARIES = $(KLIB) $(HESLIBS)
         DEFINES = -DKERBEROS -DKRB5 -DMAIL_USE_POP $(OSDEFS) $(HESDEFS)
          OSDEFS = -DMAIL_USE_FLOCK -DBSD
 
-SimpleProgramTarget(movemail)
+SimpleTestProgramTarget(movemail)

diff --git a/src/appl/popper/Imakefile b/src/appl/popper/Imakefile
index 6b0714a0488d54c14383fbe60f4f091cc021aaa9..cbcb984ea2c966a74e3af80726cf1b082c0260ff 100644 (file)
--- a/src/appl/popper/Imakefile
+++ b/src/appl/popper/Imakefile
@@ -69,9 +69,11 @@ SPOP_SRCS    =       pop_enter.c
 all:: popper
 
 NormalProgramTarget(popper,$(OBJS),$(DEP_LIBS),$(LOCAL_LIBRARIES),)
+Krb5InstallServerProgram(popper)
 
 #if 0
 NormalProgramTarget(spop,$(SPOP_OBJS),$(DEP_LIBS),$(LOCAL_LIBRARIES),)
+Krb5InstallServerProgram(spop)
 #endif
 
 DependTarget()

diff --git a/src/appl/simple/client/Imakefile b/src/appl/simple/client/Imakefile
index b8c96e663a8ab489b2aaf8575b2074a75e025dca..e85f47d8ee2af3f92403828bade2237933212e87 100644 (file)
--- a/src/appl/simple/client/Imakefile
+++ b/src/appl/simple/client/Imakefile
@@ -12,4 +12,4 @@
 LOCAL_LIBRARIES = $(KLIB)
        INCLUDES = -I..
 
-SimpleProgramTarget(sim_client)
+SimpleTestProgramTarget(sim_client)

diff --git a/src/appl/simple/server/Imakefile b/src/appl/simple/server/Imakefile
index 27488904e455b5080054c9f3db392862bf282ec9..9a3529060fde0ffbcda9714c772bdc2ef529e232 100644 (file)
--- a/src/appl/simple/server/Imakefile
+++ b/src/appl/simple/server/Imakefile
@@ -12,4 +12,4 @@
 LOCAL_LIBRARIES = $(KLIB)
        INCLUDES = -I..
 
-SimpleProgramTarget(sim_server)
+SimpleTestProgramTarget(sim_server)

diff --git a/src/clients/kdestroy/Imakefile b/src/clients/kdestroy/Imakefile
index 0f61fb2a9b5c3cd5992767baf556aadd833e0e5a..023881757c44c158a2f78e8a929f89f993e0cace 100644 (file)
--- a/src/clients/kdestroy/Imakefile
+++ b/src/clients/kdestroy/Imakefile
@@ -11,4 +11,4 @@
         DEPLIBS = $(DEPKLIB)
 LOCAL_LIBRARIES = $(KLIB)
 
-SimpleProgramTarget(kdestroy)
+Krb5ClientProgramTarget(kdestroy)

diff --git a/src/clients/kinit/Imakefile b/src/clients/kinit/Imakefile
index b5279e000c3450f56e564ac4a180650fe7279935..4eb0480971f403170bcf77cf6f2ba6d443160549 100644 (file)
--- a/src/clients/kinit/Imakefile
+++ b/src/clients/kinit/Imakefile
@@ -11,4 +11,4 @@
         DEPLIBS = $(DEPKLIB)
 LOCAL_LIBRARIES = $(KLIB)
 
-SimpleProgramTarget(kinit)
+Krb5ClientProgramTarget(kinit)

diff --git a/src/clients/klist/Imakefile b/src/clients/klist/Imakefile
index 95b018e5127fa5e909d97a1e1b9a78a21b06faec..72c80fdeea868596d61c32122ad9887645436d35 100644 (file)
--- a/src/clients/klist/Imakefile
+++ b/src/clients/klist/Imakefile
@@ -11,4 +11,4 @@
         DEPLIBS = $(DEPKLIB)
 LOCAL_LIBRARIES = $(KLIB)
 
-SimpleProgramTarget(klist)
+Krb5ClientProgramTarget(klist)

diff --git a/src/kdc/Imakefile b/src/kdc/Imakefile
index 097345a9c0ae4b21f1c7f9f4b153ae5aff5ac2a0..e95a2d41aedf19c07593f1447f810f892835a953 100644 (file)
--- a/src/kdc/Imakefile
+++ b/src/kdc/Imakefile
@@ -55,6 +55,7 @@ kdc5_err.c: kdc5_err.et
 
 NormalProgramTarget(krb5kdc,$(OBJS),$(KDBDEPLIB) $(DEPKLIB), \
        $(KDBLIB) $(KLIB) $(K4LIB),)
+Krb5InstallServerProgram(krb5kdc)
 
 clean::
        $(RM) kdc5_err.h kdc5_err.c

diff --git a/src/slave/Imakefile b/src/slave/Imakefile
index 2ee88e669669a8cd2365abb427df746fbc85f807..98b14faa75b74feafac4e955d81e6b86c36fffa3 100644 (file)
--- a/src/slave/Imakefile
+++ b/src/slave/Imakefile
@@ -23,7 +23,11 @@ SRCS= $(CLIENTSRCS) $(SERVERSRCS)
 all::  kprop kpropd
 
 NormalProgramTarget(kprop,$(CLIENTOBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),)
+Krb5InstallAdminProgram(kprop)
+
 NormalProgramTarget(kpropd,$(SERVEROBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),)
+Krb5InstallAdminProgram(kpropd)
+
 SaberProgramTarget(kprop, $(CLIENTSRCS), $(CLIENTOBJS), 
        $(DEPLIBS) $(LOCAL_LIBRARIES),)
 SaberProgramTarget(kpropd, $(SERVERSRCS), $(SERVEROBJS), 

diff --git a/src/tests/create/Imakefile b/src/tests/create/Imakefile
index f034fe30466e31b255ed7abb4abcd147438d0f26..d003f26a8f30aeaea4eff5dbd813f1c07c349f80 100644 (file)
--- a/src/tests/create/Imakefile
+++ b/src/tests/create/Imakefile
@@ -11,6 +11,6 @@
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
-SimpleProgramTarget(kdb5_mkdums)
+SimpleTestProgramTarget(kdb5_mkdums)
 
 

diff --git a/src/tests/hammer/Imakefile b/src/tests/hammer/Imakefile
index 7ecf8a95d4d7a70a5dc9b644948ef1b02e4bc9f5..0b2291b7bbb09f19636a48c27526c189bd9e56a8 100644 (file)
--- a/src/tests/hammer/Imakefile
+++ b/src/tests/hammer/Imakefile
@@ -11,4 +11,4 @@
         DEPLIBS = $(DEPKLIB)
 LOCAL_LIBRARIES = $(KLIB)
 
-SimpleProgramTarget(kdc5_hammer)
+SimpleTestProgramTarget(kdc5_hammer)

diff --git a/src/tests/verify/Imakefile b/src/tests/verify/Imakefile
index 21cb293db7281203e549a28115617293e5a3c008..02a3a0a7315b5f919d08664e6bc355ab1c2dda07 100644 (file)
--- a/src/tests/verify/Imakefile
+++ b/src/tests/verify/Imakefile
@@ -11,4 +11,4 @@
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
 
-SimpleProgramTarget(kdb5_verify)
+SimpleTestProgramTarget(kdb5_verify)