changes to fix make install

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

10 files changed, 120 insertions, 19 deletions

diff --git a/src/lib/configure.in b/src/lib/configure.in
index b2dfabbee..751be0f5e 100644
--- a/src/lib/configure.in
+++ b/src/lib/configure.in
@@ -6,6 +6,7 @@ AC_PROG_ARCHIVE
 AC_PROG_RANLIB
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 LinkFile(libkrb5.a, krb5/libkrb5.a)
 LinkFile(libcrypto.a, crypto/libcrypto.a)
 LinkFile(libgssapi_krb5.a, gssapi/libgssapi_krb5.a)
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index da6c0ea78..4b7f5528e 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -11,10 +11,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS)
 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
+
 RM = rm -f
 CP = cp
 RANLIB = @RANLIB@
@@ -38,6 +54,6 @@ libcrypto.a: des/DONE md4/DONE md5/DONE crc32/DONE os/DONE $(OBJS)
 	$(RANLIB) $@
 
 install:: libcrypto.a
-	$(RM) $(KRB5_LIBDIR)/lib/libcrypto.a
-	$(CP) libcrypto.a $(KRB5_LIBDIR)/lib/libcrypto.a
-	$(RANLIB) $(KRB5_LIBDIR)/lib/libcrypto.a
+	$(RM) $(KRB5_LIBDIR)/libcrypto.a
+	$(CP) libcrypto.a $(KRB5_LIBDIR)/libcrypto.a
+	$(RANLIB) $(KRB5_LIBDIR)/libcrypto.a
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index 34d811e29..c6e7a10cd 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -10,4 +10,5 @@ MAKE_SUBDIRS("cleaning",clean)
 AppendRule([all:: libcrypto.a])
 KRB_INCLUDE
 CONFIG_RULES
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 2716c25e2..4e62c5f6b 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -12,7 +12,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)
 LDFLAGS = -g
 
@@ -68,9 +84,9 @@ libdes425.a: $(OBJS)
 	$(RANLIB) $(BUILDTOP)/lib/libdes425.a
 
 install:: libdes425.a
-	$(RM) $(KRB5_LIBDIR)/lib/libdes425.a
-	$(CP) libdes425.a $(KRB5_LIBDIR)/lib/libdes425.a
-	$(RANLIB) $(KRB5_LIBDIR)/lib/libdes425.a
+	$(RM) $(KRB5_LIBDIR)/libdes425.a
+	$(CP) libdes425.a $(KRB5_LIBDIR)/libdes425.a
+	$(RANLIB) $(KRB5_LIBDIR)/libdes425.a
 
 clean::
 	$(RM) $(OBJS)
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 22ff4cac7..1f2adc08e 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -7,6 +7,23 @@ ARADD = @ARADD@
 CC = @CC@
 CCOPTS = @CCOPTS@
 SUBDIRS = @SUBDIRS@
+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
+
 
 RM = rm -f
 CP = cp
@@ -22,9 +39,9 @@ libgssapi_krb5.a: generic/DONE krb5/DONE
 	$(RANLIB) $@
 
 install:: libgssapi_krb5.a
-	$(RM) $(KRB5_LIBDIR)/lib/libgssapi_krb5.a
-	$(CP) libgssapi_krb5.a $(KRB5_LIBDIR)/lib/libgssapi_krb5.a
-	$(RANLIB) $(KRB5_LIBDIR)/lib/libgssapi_krb5.a
+	$(RM) $(KRB5_LIBDIR)/libgssapi_krb5.a
+	$(CP) libgssapi_krb5.a $(KRB5_LIBDIR)/libgssapi_krb5.a
+	$(RANLIB) $(KRB5_LIBDIR)/libgssapi_krb5.a
 
 clean::
 	$(RM) libgssapi_krb5.a
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index bdbb2f0ab..cc6a8875e 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -9,4 +9,5 @@ MAKE_SUBDIRS("cleaning",clean)
 AppendRule([all:: libgssapi_krb5.a])
 WITH_CCOPTS
 CONFIG_RULES
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 9a8278e0c..c32da1fac 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -10,7 +10,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)
 LDFLAGS = -g
 
@@ -51,9 +67,9 @@ libkdb5.a: $(OBJS)
 	$(RANLIB) $(BUILDTOP)/lib/libkdb5.a
 
 install:: libkdb5.a
-	$(RM) $(KRB5_LIBDIR)/lib/libkdb5.a
-	$(CP) libkdb5.a $(KRB5_LIBDIR)/lib/libkdb5.a
-	$(RANLIB) $(KRB5_LIBDIR)/lib/libkdb5.a
+	$(RM) $(KRB5_LIBDIR)/libkdb5.a
+	$(CP) libkdb5.a $(KRB5_LIBDIR)/libkdb5.a
+	$(RANLIB) $(KRB5_LIBDIR)/libkdb5.a
 
 clean::
 	$(RM) $(OBJS)
diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in
index f6ff3f801..ae900598f 100644
--- a/src/lib/krb425/Makefile.in
+++ b/src/lib/krb425/Makefile.in
@@ -10,10 +10,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) -I$(SRCTOP)/include/kerberosIV
 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
+
 EHDRDIR = $(BUILDTOP)/include/kerberosIV
 
 RM = rm -f
@@ -84,9 +100,9 @@ libkrb425.a: ${OBJS}
 	$(RANLIB) $(BUILDTOP)/lib/libkrb425.a
 
 install:: libkrb425.a
-	$(RM) $(KRB5_LIBDIR)/lib/libkrb425.a
-	$(CP) libkrb425.a $(KRB5_LIBDIR)/lib/libkrb425.a
-	$(RANLIB) $(KRB5_LIBDIR)/lib/libkrb425.a
+	$(RM) $(KRB5_LIBDIR)/libkrb425.a
+	$(CP) libkrb425.a $(KRB5_LIBDIR)/libkrb425.a
+	$(RANLIB) $(KRB5_LIBDIR)/libkrb425.a
 
 clean::
 	$(RM) $(OBJS)
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index e1d51c75a..e59307a56 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -8,9 +8,25 @@ CC = @CC@
 CCOPTS = @CCOPTS@
 
 SUBDIRS = @SUBDIRS@
+KRB5ROOT = @KRB5ROOT@
 
 RM = rm -f
 CP = cp
+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
+
 RANLIB = @RANLIB@
 
 TST=if test -n "`cat DONE`" ; then
@@ -35,9 +51,9 @@ libkrb5.a: error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
 	$(RANLIB) $@
 
 install:: libkrb5.a
-	$(RM) $(KRB5_LIBDIR)/lib/libkrb5.a
-	$(CP) libkrb5.a $(KRB5_LIBDIR)/lib/libkrb5.a
-	$(RANLIB) $(KRB5_LIBDIR)/lib/libkrb5.a
+	$(RM) $(KRB5_LIBDIR)/libkrb5.a
+	$(CP) libkrb5.a $(KRB5_LIBDIR)/libkrb5.a
+	$(RANLIB) $(KRB5_LIBDIR)/libkrb5.a
 
 clean::
 	$(RM) libkrb5.a
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 2280c12fc..2d8b9ff21 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -9,4 +9,5 @@ MAKE_SUBDIRS("cleaning",clean)
 AppendRule([all:: libkrb5.a])
 WITH_CCOPTS
 CONFIG_RULES
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])