changes to fix make install

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

13 files changed, 115 insertions, 12 deletions

diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index f15515017..25ce2bd43 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -33,8 +49,8 @@ kdb5_anadd: kdb5_anadd.o $(DEPLIBS)
 	$(CC) $(CFLAGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-	$(INSTALLPROG) kdb5_anadd ${DESTDIR}$(ADMIN_BINDIR)/kdb5_anadd
-	$(INSTALLPROG) kdb5_anadd.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_anadd.$(ADMIN_MANSUFFIX)
+	cp kdb5_anadd $(DESTDIR)$(ADMIN_BINDIR)/kdb5_anadd
+	cp kdb5_anadd.M $(DESTDIR)$(ADMIN_MANDIR)/kdb5_anadd.8
 
 clean::
 	$(RM) kdb5_anadd kdb5_anadd.o
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 5b63212bf..54eb2f3d1 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -6,4 +6,5 @@ AC_HAVE_LIBRARY(nsl)
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/admin/configure.in b/src/admin/configure.in
index 0dc9b07ec..6c3098b7e 100644
--- a/src/admin/configure.in
+++ b/src/admin/configure.in
@@ -5,6 +5,7 @@ AC_WITH([krb4],convert=convert,convert=)
 CONFIG_DIRS(create destroy edit stash aname $convert)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index 5efdc3e2e..a9899d90f 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -7,10 +7,26 @@ CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 KRB4 = @KRB4@
+KRB5ROOT = @KRB5ROOT@
 
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -37,8 +53,8 @@ kdb5_convert: kdb5_convert.o $(DEPLIBS)
 	$(CC) $(CFLAGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-	$(INSTALLPROG) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert
-	$(INSTALLPROG) kdb5_convert.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_convert.$(ADMIN_MANSUFFIX)
+	cp kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert
+	cp kdb5_convert.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_convert.8
 
 clean::
 	$(RM) kdb5_convert kdb5_convert.o
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 382f1e706..f1c9dfe9f 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -7,4 +7,5 @@ CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB4
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in
index 94e98899c..88fefa30e 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -33,8 +49,8 @@ kdb5_create: kdb5_create.o $(DEPLIBS)
 	$(CC) $(CFLAGS) -o kdb5_create kdb5_create.o $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-	$(INSTALLPROG) kdb5_create ${DESTDIR}$(ADMIN_BINDIR)/kdb5_create
-	$(INSTALLPROG) kdb5_create.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_create.$(ADMIN_MANSUFFIX)
+	cp kdb5_create $(DESTDIR)$(ADMIN_BINDIR)/kdb5_create
+	cp kdb5_create.M $(DESTDIR)$(ADMIN_MANDIR)/kdb5_create.8
 
 clean::
 	$(RM) kdb5_create kdb5_create.o
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index ae1fa0497..dd91e3b4c 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(kdb5_create.c)
 WITH_CCOPTS
+WITH_KRB5ROOT
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index bd4b05170..aa51dbd85 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT =  @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -33,8 +49,8 @@ kdb5_destroy: kdb5_destroy.o $(DEPLIBS)
 	$(CC) $(CFLAGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-	$(INSTALLPROG) kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy
-	$(INSTALLPROG) kdb5_destroy.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_destroy.$(ADMIN_MANSUFFIX)
+	cp kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy
+	cp kdb5_destroy.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_destroy.8
 
 clean::
 	$(RM) kdb5_destroy kdb5_destroy.o
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index bb1c72f12..14fb7ea35 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -6,4 +6,5 @@ AC_HAVE_LIBRARY(nsl)
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index f07d42762..06cc4e72a 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -37,8 +53,8 @@ kdb5_edit: kdb5_edit.o $(DEPLIBS) $(OBJS)
 	$(CC) $(CFLAGS) -o kdb5_edit $(OBJS) $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-	$(INSTALLPROG) kdb5_edit ${DESTDIR}$(ADMIN_BINDIR)/kdb5_edit
-	$(INSTALLPROG) kdb5_edit.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_edit.$(ADMIN_MANSUFFIX)
+	cp kdb5_edit ${DESTDIR}$(ADMIN_BINDIR)/kdb5_edit
+	cp kdb5_edit.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_edit.8
 
 # needed until we run makedepend
 kdb5_ed_ct.c: kdb5_ed_ct.ct
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index ca9352a5c..310cad522 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -8,4 +8,5 @@ SS_RULES
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index 1adea44fc..9212f96a5 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -33,8 +49,8 @@ kdb5_stash: kdb5_stash.o $(DEPLIBS)
 	$(CC) $(CFLAGS) -o kdb5_stash kdb5_stash.o $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-	$(INSTALLPROG) kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash
-	$(INSTALLPROG) kdb5_stash.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_stash.$(ADMIN_MANSUFFIX)
+	cp kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash
+	cp kdb5_stash.M ${DESTDIR}$(ADMIN_MANDIR)/kdb5_stash.8
 
 clean::
 	$(RM) kdb5_stash kdb5_stash.o
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index fb1b46b64..f7d1444e0 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -6,4 +6,5 @@ AC_HAVE_LIBRARY(nsl)
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])