updates for install stuff

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

18 files changed, 24 insertions, 13 deletions

diff --git a/src/Imakefile b/src/Imakefile
index 5f058146d..18097eac5 100644
--- 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 a37aef22c..0df94eaaf 100644
--- 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 0f6e09020..c709a3a21 100644
--- 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 ae3e740d9..52af97d6e 100644
--- 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 9e266531c..02f2530a7 100644
--- 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 3004adeda..97de7926c 100644
--- 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 1e36a0911..160141bb4 100644
--- 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 6b0714a04..cbcb984ea 100644
--- 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 b8c96e663..e85f47d8e 100644
--- 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 27488904e..9a3529060 100644
--- 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 0f61fb2a9..023881757 100644
--- 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 b5279e000..4eb048097 100644
--- 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 95b018e51..72c80fdee 100644
--- 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 097345a9c..e95a2d41a 100644
--- 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 2ee88e669..98b14faa7 100644
--- 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 f034fe304..d003f26a8 100644
--- 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 7ecf8a95d..0b2291b7b 100644
--- 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 21cb293db..02a3a0a73 100644
--- 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)