changes to fix make install

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

5 files changed, 39 insertions, 4 deletions

diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in
index b699cf4bd..2e1694ad4 100644
--- a/src/kadmin/client/Makefile.in
+++ b/src/kadmin/client/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
@@ -58,8 +74,8 @@ kadmin: $(KDBDEPLIB) $(OBJS) $(DEBKLIB)
 	$(CC) $(CFLAGS) -o kadmin $(OBJS) $(KLIB) $(LIBS)
 
 install::
-	$(INSTALLPROG) kadmin ${DESTDIR}$(CLIENT_BINDIR)/kadmin
-	$(INSTALLPROG) kadmin.M ${DESTDIR}$(CLIENT_MANDIR)/kadmin.$(CLIENT_MANSUFFIX)
+	cp kadmin ${DESTDIR}$(CLIENT_BINDIR)/kadmin
+	cp kadmin.M ${DESTDIR}$(CLIENT_MANDIR)/kadmin.1
 
 clean::
 	$(RM) kadmin
diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in
index 7e68827f0..68639b006 100644
--- a/src/kadmin/client/configure.in
+++ b/src/kadmin/client/configure.in
@@ -7,4 +7,5 @@ ET_RULES
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index 29638d105..35e3b5f76 100644
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -5,6 +5,7 @@ AC_WITH([krb4],v4server=v4server,v4server=)
 CONFIG_DIRS(client kpasswd server $v4server)
 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/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index c39ee1e44..a7add62a4 100644
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -6,7 +6,23 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
+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
+
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
@@ -42,8 +58,8 @@ kpasswd: $(KDBDEPLIB) $(OBJS) $(DEBKLIB)
 	$(CC) $(CFLAGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS)
 
 install::
-	$(INSTALLPROG) kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd
-	$(INSTALLPROG) kpasswd.M ${DESTDIR}$(CLIENT_MANDIR)/kpasswd.$(CLIENT_MANSUFFIX)
+	cp kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd
+	cp kpasswd.M ${DESTDIR}$(CLIENT_MANDIR)/kpasswd.1
 
 clean::
 	$(RM) kpasswd
diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in
index d1aa83c97..9a23ca9f7 100644
--- a/src/kadmin/kpasswd/configure.in
+++ b/src/kadmin/kpasswd/configure.in
@@ -7,4 +7,5 @@ ET_RULES
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])