changes to fix make install

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

diff --git a/src/ChangeLog b/src/ChangeLog
index f84f8f03b83443f3387ee509b6b3f118d51631e6..7b118957a696f47f2f395f390de73e5dc319d881 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 25 00:33:56 1994  Tom Yu  (tlyu at dragons-lair)
+
+       * Makefile.in (in all relevant subdirs): make install will dtrt
+       now (mostly)
+       * configure.in (in all relevant subdirs): ditto
+
 Thu Jun 23 01:13:20 1994  Tom Yu  (tlyu at dragons-lair)
 
        * aclocal.m4 (CONFIG_RULES): make --with-cc= dtrt and default to

diff --git a/src/Makefile.in b/src/Makefile.in
index 903e4e6f7757251578be931441c400e01755ebe2..0aa36ff2d9b4c1a394abf97c9560581a8ed19c5b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT= @KRB5ROOT@
 
 CFLAGS = $(CCOPTS)
 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
+
 prefix = /usr/local
 exec_prefix = $(prefix)
 binprefix =
@@ -52,8 +68,8 @@ depend:: includes
 install-mkdirs:
        -mkdir $(INSTALLMKDIRS)
 
-install::
-       $(MAKE) $(MFLAGS) install.man
+# install::
+#      $(MAKE) $(MFLAGS) install.man
 
 # rebuild the Makefiles in the master source tree
 mastermakefiles::

diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index f155150172f79035d9a4810e5d9a9fe0f3f42f35..25ce2bd43aff7a2d467ee712044246792a98f8ce 100644 (file)
--- 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 5b63212bf0339cfe6e713a0b230a72844da4f5be..54eb2f3d1817a66e3437724e82b8c5ea20f04d51 100644 (file)
--- 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 0dc9b07ecc2192bc090fa958edf2080242577e27..6c3098b7e91fc19badb20f274afe92fc01cc8e9e 100644 (file)
--- 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 5efdc3e2e7210120c84dde1e5ea6b8692774b8f2..a9899d90f4229612f88f0062bfcd198cbbe39a63 100644 (file)
--- 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 382f1e70683b33c3a764998b4e7551a2e1ba734e..f1c9dfe9ffcae523b060bc530256856dfc3a20a2 100644 (file)
--- 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 94e98899c71f02bcdbf5beb0842be60e74fb0cd1..88fefa30efcfa2bfcf2f0fe56d645b099376ca4d 100644 (file)
--- 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 ae1fa0497b342c95bd1ec881b27045495b3f940e..dd91e3b4c2ddc69e656b76b1586f5cd704fe1618 100644 (file)
--- 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 bd4b05170aeeab875006bec2300f3129e8016a5e..aa51dbd85f74e5cf96e3faae5aae0a1986e8fdb8 100644 (file)
--- 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 bb1c72f128e11bf09aefdbe18b55b18d7fa12409..14fb7ea357047f160b7d9c9b3d3f383de33c081e 100644 (file)
--- 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 f07d427621204294108a8f8f43fe283037c0de81..06cc4e72a42e537410a1bc5c948f74e4ecd516e8 100644 (file)
--- 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 ca9352a5c79bce091aa44d7df64243862a09c055..310cad522f177b7d964c5781113af1d0d30e81eb 100644 (file)
--- 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 1adea44fca80d01296f917deff5ea389288ac095..9212f96a5a49a60de6e4438672737395f7b51146 100644 (file)
--- 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 fb1b46b642d42564da821511eae05a06cac54b6a..f7d1444e0b1c8c41eb95fc13e59a9196fde1e419 100644 (file)
--- 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])

diff --git a/src/appl/configure.in b/src/appl/configure.in
index 11149d12526cf3d260e0e308e6000fbcfeb49c1c..c77cc312cd801b78c03ba7bc53312a48c7116201 100644 (file)
--- a/src/appl/configure.in
+++ b/src/appl/configure.in
@@ -4,5 +4,6 @@ AC_SET_BUILDTOP
 CONFIG_DIRS(sample simple user_user)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in
index 3d953e69fdf5257dbff778f8b924640995b91558..5f1ad6f9086529c52083ce37dff5735eb0c9bd4a 100644 (file)
--- a/src/appl/sample/configure.in
+++ b/src/appl/sample/configure.in
@@ -4,5 +4,6 @@ AC_SET_BUILDTOP
 CONFIG_DIRS(sclient sserver)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index d53e8322e472f921b819cc5e3e5be06e4fb725c8..6011e99197512d744c853b2a7019e88b70bcad34 100644 (file)
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/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
@@ -32,5 +48,5 @@ clean::
        $(RM) sclient.o sclient
 
 install::
-       $(INSTALLPROG) sclient ${DESTDIR}$(CLIENT_BINDIR)/sclient
-       $(INSTALLPROG) sclient.M ${DESTDIR}$(CLIENT_MANDIR)/sclient.$(CLIENT_MANSUFFIX)
+       cp sclient ${DESTDIR}$(CLIENT_BINDIR)/sclient
+       cp sclient.M ${DESTDIR}$(CLIENT_MANDIR)/sclient.1

diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 8650da60142451965fa85e9efd5997a04047c8b4..4632b9f2603cfc93e0bb707e76f747bacbc776fb 100644 (file)
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/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/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index bc13541fe7ee715c753965dd6573df3264768534..8c3a0585b78a4efd326c23a0f3c890e864c1546e 100644 (file)
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/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
@@ -32,5 +48,5 @@ clean::
        $(RM) sserver.o sserver
 
 install::
-       $(INSTALLPROG) sserver ${DESTDIR}$(SERVER_BINDIR)/sserver
-       $(INSTALLPROG) sserver.M ${DESTDIR}$(SERVER_MANDIR)/sserver.$(SERVER_MANSUFFIX)
+       cp sserver ${DESTDIR}$(SERVER_BINDIR)/sserver
+       cp sserver.M ${DESTDIR}$(SERVER_MANDIR)/sserver.8

diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index c11045cc966e0be0e67cce8c86886ecf7bb82dbe..348a4aeaf92de0a4084519a2cad2869d2783d3fe 100644 (file)
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/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/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 6f37631da25af487593d6330f49c2100f3cc756b..00d339a5b76040d9fed6bda651049719b90b9e34 100644 (file)
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -6,6 +6,7 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
@@ -29,6 +30,8 @@ sim_client.o: $(srcdir)/sim_client.c
 
 all:: sim_client
 
+install::
+       cp sim_client $(DESTDIR)$(CLIENT_BINDIR)/sim_client
 
 clean::
        $(RM) sim_client.o sim_client

diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
index c0a21344652e44ebf0ce30d74529d62c9dc5ac1d..b8f092e3b6433f4e3925c38c9dfe2a85b4011267 100644 (file)
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/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/appl/simple/configure.in b/src/appl/simple/configure.in
index 518fea4e44672542c0e52edf0a2ca60526b9d816..350af510f834ffa36f4ec5fd4b33e715e1fa8084 100644 (file)
--- a/src/appl/simple/configure.in
+++ b/src/appl/simple/configure.in
@@ -4,5 +4,6 @@ AC_SET_BUILDTOP
 CONFIG_DIRS(client server)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index d2a396c5d9bac822c5f462c4f0c6c6e41dbbc88f..f2c094d604e46f9b898b3d298cc0ff746cfcd3ce 100644 (file)
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/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
@@ -29,6 +45,9 @@ sim_server.o: $(srcdir)/sim_server.c
 
 all:: sim_server
 
+install::
+       cp sim_server $(DESTDIR)$(SERVER_BINDIR)/sim_server
+
 
 clean::
        $(RM) sim_server.o sim_server

diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
index 358f32ddcb36ca893e0fee7506ae5a66e7329ffd..4f25a39d420494a49735dcd470cb9b995c807aef 100644 (file)
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/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/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index e24ad70ccf4e34e332399d4a0dff9fba8f06f905..7ff8ffa4d2ae10ffaa984f4629a97408d1dbc7a0 100644 (file)
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
 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
@@ -38,6 +54,9 @@ server.o:     $(srcdir)/server.c
 
 all:: uuserver
 
+install::
+       cp uuclient $(DESTDIR)$(CLIENT_BINDIR)/uuclient
+       cp uuserver $(DESTDIR)$(SERVER_BINDIR)/uusrever
 
 clean::
        $(RM) server.o uuserver

diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in
index 84817731231d6d3acac8b98207e853b5d35cdf88..be031d5ac5c78b4d1ce571042a90c908e2d3b304 100644 (file)
--- a/src/appl/user_user/configure.in
+++ b/src/appl/user_user/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/clients/configure.in b/src/clients/configure.in
index 7be2a3255158d340c2c983aa40e213672796ca58..4882b5941d294cd15f733d64acd70a91001c8340 100644 (file)
--- a/src/clients/configure.in
+++ b/src/clients/configure.in
@@ -4,5 +4,6 @@ AC_SET_BUILDTOP
 CONFIG_DIRS(klist kinit kdestroy)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index c7fd0ce3bde51532d6bfe6b38e314f47dc414136..512ee22dcc573b8815ce21a6d67490ed6665a8f5 100644 (file)
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/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
@@ -32,5 +48,5 @@ clean::
        $(RM) kdestroy.o kdestroy
 
 install::
-       $(INSTALLPROG) kdestroy ${DESTDIR}$(CLIENT_BINDIR)/kdestroy
-       $(INSTALLPROG) kdestroy.M ${DESTDIR}$(CLIENT_MANDIR)/kdestroy.$(CLIENT_MANSUFFIX)
+       cp kdestroy ${DESTDIR}$(CLIENT_BINDIR)/kdestroy
+       cp kdestroy.M ${DESTDIR}$(CLIENT_MANDIR)/kdestroy.1

diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in
index 0d725e504513602f2dbf0bec0d791c724ec6a250..761ce209a2dec8d2a723cba5232c906a293fafcb 100644 (file)
--- a/src/clients/kdestroy/configure.in
+++ b/src/clients/kdestroy/configure.in
@@ -4,4 +4,5 @@ AC_SET_BUILDTOP
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index 7aa2aeb62f09a87715fa7ca08c9c8c0145ce6c0b..8158ea7a6a6e576cdbbd06c37ff6240c4d86810a 100644 (file)
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/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
@@ -32,5 +48,5 @@ clean::
        $(RM) kinit.o kinit
 
 install::
-       $(INSTALLPROG) kinit ${DESTDIR}$(CLIENT_BINDIR)/kinit
-       $(INSTALLPROG) kinit.M ${DESTDIR}$(CLIENT_MANDIR)/kinit.$(CLIENT_MANSUFFIX)
+       cp kinit ${DESTDIR}$(CLIENT_BINDIR)/kinit
+       cp kinit.M ${DESTDIR}$(CLIENT_MANDIR)/kinit.1

diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in
index 21a6a7fe64136c848d2cc71c4fe8db6f8c475d34..8b251dae38774ad2b51785a43fa5111aa7ab9061 100644 (file)
--- a/src/clients/kinit/configure.in
+++ b/src/clients/kinit/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/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 7e6e4a24daae8858dfdce9309e7881a857377981..ba826681bc67ad8971413e5267b8137e71814682 100644 (file)
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/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
@@ -27,10 +43,9 @@ klist.o:     $(srcdir)/klist.c
 
 all:: klist
 
-
 clean::
        $(RM) klist.o klist
 
 install::
-       $(INSTALLPROG) klist ${DESTDIR}$(CLIENT_BINDIR)/klist
-       $(INSTALLPROG) klist.M ${DESTDIR}$(CLIENT_MANDIR)/klist.$(CLIENT_MANSUFFIX)
+       cp klist ${DESTDIR}$(CLIENT_BINDIR)/klist
+       cp klist.M ${DESTDIR}$(CLIENT_MANDIR)/klist.1

diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in
index 491d8832eea5a4459096d256188cd36e62004c8c..9261dba6597840ba5ce8d69b9a8b3384e613a5d1 100644 (file)
--- a/src/clients/klist/configure.in
+++ b/src/clients/klist/configure.in
@@ -4,4 +4,5 @@ AC_SET_BUILDTOP
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/configure.in b/src/configure.in
index 6b7aabe3ae64c4ffac3e7e8e565f5214f49ca99f..783b9adb402ef4b1622bfe3a09aec4ac6a35a68a 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,8 +1,10 @@
 AC_INIT(configure.in)
 WITH_CCOPTS
 AC_SET_BUILDTOP
+WITH_KRB5ROOT
 CONFIG_DIRS(util include isode lib kdc admin kadmin slave clients appl)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/include/configure.in b/src/include/configure.in
index ecbd36777fd1d080509b0e2b27e5e5d57513f87a..075bec774abb0d1c74333ea83e5f1fde19c94013 100644 (file)
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -3,5 +3,6 @@ AC_SET_BUILDTOP
 CONFIG_DIRS(krb5 kerberosIV)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in
index f275dce1031c5d7a8f79c388b8ce770d4e380f50..4abb941e7be5a53a9729b3994d94ecbbbf4aba7c 100644 (file)
--- a/src/include/kerberosIV/Makefile.in
+++ b/src/include/kerberosIV/Makefile.in
@@ -16,5 +16,5 @@ KRB5_INCDIR = $(KRB5ROOT)/include
 
 install:: $(KRB4_HEADERS)
        @set -x; for f in $(KRB4_HEADERS) ; \
-       do $(INSTALL) -c $(INSTDATFLAGS) $$f $(KRB5_INCDIR)/kerberosIV/$$f ; \
+       do cp $$f $(KRB5_INCDIR)/kerberosIV/$$f ; \
        done

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index e9810bd6fc5e616c06fe03ccf5fc79df50c582f0..c306ae020d83883c9915f99f028e8f55d3bf1420 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -11,6 +11,20 @@ KRB5ROOT = @KRB5ROOT@
 KDB5DIR = $(KRB5ROOT)
 KRB5SRVTABDIR = /etc
 
+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
 
@@ -45,7 +59,7 @@ KRB5_INCDIR = $(KRB5ROOT)/include
 
 install:: $(KRB5_HEADERS) config.h osconf.h autoconf.h
        @set -x; for f in $(KRB5_HEADERS) config.h osconf.h ; \
-       do $(INSTALL) -c $(INSTDATFLAGS) $$f $(KRB5_INCDIR)/krb5/$$f ; \
+       do cp $$f $(KRB5_INCDIR)/krb5/$$f ; \
        done
 
 PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \

diff --git a/src/isode/Makefile.in b/src/isode/Makefile.in
index f1d0a1e57e84eb93e403784eb6096e520ccfccf5..bdc37620732339714f2f7dd3a5616b2da05d556e 100644 (file)
--- a/src/isode/Makefile.in
+++ b/src/isode/Makefile.in
@@ -5,5 +5,7 @@ CC = @CC@
 CCOPTS = @CCOPTS@
 
 all::
+install::
+       @echo "nothing to install in isode (thankfully!)"
 
 SUBDIRS = @SUBDIRS@

diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in
index b699cf4bdd4f349fd6ddbaf1351d6403b323d019..2e1694ad4f73cedebaa82268d82660ae6a14bff4 100644 (file)
--- 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 7e68827f0675dff10ee3ef7511b1fe7235b4b36f..68639b00681a2b8b9cbb6450d28730df1ec646d6 100644 (file)
--- 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 29638d105d10438b5c7eb00b12a13dfedf8cdeaf..35e3b5f762eb86f546ac49e528f2bac59d51bb49 100644 (file)
--- 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 c39ee1e447fca87d4a32bb43826862b33fd610fb..a7add62a46e9575b95898b3ca7a3b384e7dee3e6 100644 (file)
--- 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 d1aa83c971ca4759a4ca3229db311903193aa8e7..9a23ca9f7e99c206910165135f447548df7bf4b9 100644 (file)
--- 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])

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 941295c81a927b0083c66f2cab7145d3ca5fe4af..acb7aadb3577cd52d67cb8a3a65679484c866f02 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -8,10 +8,26 @@ CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 KRB4 = @KRB4@
 K4LIB = @K4LIB@
+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
@@ -73,8 +89,8 @@ krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB)
        $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KLIB) $(K4LIB) $(LIBS)
 
 install::
-       $(INSTALLPROG) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
-       $(INSTALLPROG) krb5kdc.M ${DESTDIR}$(SERVER_MANDIR)/krb5kdc.$(SERVER_MANSUFFIX)
+       cp krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
+       cp krb5kdc.M ${DESTDIR}$(SERVER_MANDIR)/krb5kdc.8
 
 clean::
        $(RM) kdc5_err.h kdc5_err.c

diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 3836e4fe2ca9091092306a83b527690a5c31482b..932164be5941b5a39302a3a6ce55f13f55f912f3 100644 (file)
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -8,6 +8,7 @@ CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB4
+WITH_KRB5ROOT
 AC_WITH([krb4],
 ADD_DEF(-DKRB4)
 ADD_DEF(-DBACKWARD_COMPAT)

diff --git a/src/lib/configure.in b/src/lib/configure.in
index b2dfabbee6a2427c22619605596d4f340a80ee20..751be0f5e91ccbf95506c71284b11b7e1de53ffd 100644 (file)
--- 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 da6c0ea784d6cf6a4ebe277dc00e49135318f88f..4b7f5528e80d6cd5bb9f100e198aa713aabfb1c5 100644 (file)
--- 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 34d811e299bc7ec5193e54174fdda4f3de018fbd..c6e7a10cdf263900eabecf2efcfa0b313c547c92 100644 (file)
--- 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 2716c25e2bf1547415284145b202886e300100d4..4e62c5f6b0a88d6615146b06a18715004b1e175f 100644 (file)
--- 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 22ff4cac77d70bec765c9823e5084ba44730ef07..1f2adc08e537efd4a1d99af529a54032ba75546b 100644 (file)
--- 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 bdbb2f0ab42b8ce3fb1fec218183a7277d1323ab..cc6a8875ea12e40665840bd476c928087c510de1 100644 (file)
--- 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 9a8278e0c0cf3bc00d3b601d6ff596878b58a9d1..c32da1fac41c8dea3f7f1ce20b2575eebae297b5 100644 (file)
--- 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 f6ff3f8010b32805924dbe0f55779703346770b7..ae900598f33c199a27bb74251c989ef99ce9e536 100644 (file)
--- 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 e1d51c75af68e3c297f0e5260583d1f9ea38157e..e59307a564a24a3bd4665487302b4319df42e4f7 100644 (file)
--- 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 2280c12fcbd90c40dfffc5c3c59cf66d97784cdd..2d8b9ff2160537aaa798abf198eb877b705e5fa0 100644 (file)
--- 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])

diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index e9cd62a6e46d124b3460ae0ec1994863d046f723..c4fd6856add5d683b2ca251755aeec110d64dbfa 100644 (file)
--- a/src/slave/Makefile.in
+++ b/src/slave/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
@@ -42,15 +58,15 @@ kprop: $(CLIENTOBJS) $(DEPLIBS)
        $(CC) $(CFLAGS) -o kprop $(CLIENTOBJS) $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-       $(INSTALLPROG) kprop ${DESTDIR}$(SERVER_BINDIR)/kprop
-       $(INSTALLPROG) kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.$(SERVER_MANSUFFIX)
+       cp kprop ${DESTDIR}$(SERVER_BINDIR)/kprop
+       cp kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.8
 
 kpropd: $(SERVEROBJS) $(DEPLIBS)
        $(CC) $(CFLAGS) -o kpropd $(SERVEROBJS) $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
-       $(INSTALLPROG) kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd
-       $(INSTALLPROG) kpropd.M ${DESTDIR}$(SERVER_MANDIR)/kpropd.$(SERVER_MANSUFFIX)
+       cp kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd
+       cp kpropd.M ${DESTDIR}$(SERVER_MANDIR)/kpropd.8
 
 clean::
        $(RM) $(CLIENTOBJS) $(SERVEROBJS)

diff --git a/src/slave/configure.in b/src/slave/configure.in
index d21b227c8e8e42561d87ad7504d804e5e06e421a..c318289c1f288a5f758682ef7ebf82afaecfca8e 100644 (file)
--- a/src/slave/configure.in
+++ b/src/slave/configure.in
@@ -7,4 +7,5 @@ AC_HAVE_LIBRARY(util)
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 0cbe7866e9c9e807d797e6e4130a9bda9ded2fe5..88078a72057184da64de87e1b88d501b637af450 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -12,5 +12,5 @@ LDFLAGS = -g
 
 SUBDIRS = @SUBDIRS@
 
-
-
+install::
+       @echo nothing to install in util