diff options
60 files changed, 504 insertions, 58 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f84f8f0..7b11895 100644 --- 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 903e4e6..0aa36ff 100644 --- 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 f155150..25ce2bd 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 5b63212..54eb2f3 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 0dc9b07..6c3098b 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 5efdc3e..a9899d9 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 382f1e7..f1c9dfe 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 94e9889..88fefa3 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 ae1fa04..dd91e3b 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 bd4b051..aa51dbd 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 bb1c72f..14fb7ea 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 f07d427..06cc4e7 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 ca9352a..310cad5 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 1adea44..9212f96 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 fb1b46b..f7d1444 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]) diff --git a/src/appl/configure.in b/src/appl/configure.in index 11149d1..c77cc31 100644 --- 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 3d953e6..5f1ad6f 100644 --- 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 d53e832..6011e99 100644 --- 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 8650da6..4632b9f 100644 --- 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 bc13541..8c3a058 100644 --- 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 c11045c..348a4ae 100644 --- 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 6f37631..00d339a 100644 --- 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 c0a2134..b8f092e 100644 --- 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 518fea4..350af51 100644 --- 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 d2a396c..f2c094d 100644 --- 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 358f32d..4f25a39 100644 --- 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 e24ad70..7ff8ffa 100644 --- 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 8481773..be031d5 100644 --- 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 7be2a32..4882b59 100644 --- 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 c7fd0ce..512ee22 100644 --- 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 0d725e5..761ce20 100644 --- 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 7aa2aeb..8158ea7 100644 --- 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 21a6a7f..8b251da 100644 --- 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 7e6e4a2..ba82668 100644 --- 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 491d883..9261dba 100644 --- 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 6b7aabe..783b9ad 100644 --- 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 ecbd367..075bec7 100644 --- 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 f275dce..4abb941 100644 --- 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 e9810bd..c306ae0 100644 --- 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 f1d0a1e..bdc3762 100644 --- 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 b699cf4..2e1694a 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 7e68827..68639b0 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 29638d1..35e3b5f 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 c39ee1e..a7add62 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 d1aa83c..9a23ca9 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]) diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 941295c..acb7aad 100644 --- 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 3836e4f..932164b 100644 --- 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 b2dfabb..751be0f 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 da6c0ea..4b7f552 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 34d811e..c6e7a10 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 2716c25..4e62c5f 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 22ff4ca..1f2adc0 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 bdbb2f0..cc6a887 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 9a8278e..c32da1f 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 f6ff3f8..ae90059 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 e1d51c7..e59307a 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 2280c12..2d8b9ff 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]) diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index e9cd62a..c4fd685 100644 --- 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 d21b227..c318289 100644 --- 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 0cbe786..88078a7 100644 --- 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 |