From f4e8ab562c89578aec48e21349b7d80eccc87387 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 7 Oct 2004 00:00:25 +0000 Subject: [PATCH] Install example config files ticket: 249 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16810 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 4 ++++ src/Makefile.in | 2 +- src/config-files/ChangeLog | 4 ++++ src/config-files/Makefile.in | 4 +++- src/config/ChangeLog | 4 ++++ src/config/pre.in | 3 +++ 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4b5653f7c..fe47c6aeb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-10-06 Tom Yu + + * Makefile.in (INSTALLMKDIRS): Add EXAMPLEDIR. + 2004-10-05 Ken Raeburn * aclocal.m4 (KRB5_AC_ENABLE_THREADS): On HP-UX, define some diff --git a/src/Makefile.in b/src/Makefile.in index 8820b517b..225868eb6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -59,7 +59,7 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \ $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \ $(ADMIN_MANDIR) $(SERVER_MANDIR) $(CLIENT_MANDIR) \ $(FILE_MANDIR) $(KRB5_LIBDIR) $(KRB5_INCDIR) \ - $(KRB5_INCSUBDIRS) $(datadir) + $(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR) install-strip: $(MAKE) install INSTALL_STRIP=-s diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog index 80d6a9b7f..42ddabcb2 100644 --- a/src/config-files/ChangeLog +++ b/src/config-files/ChangeLog @@ -1,3 +1,7 @@ +2004-10-06 Tom Yu + + * Makefile.in (install): Install example config files. + 2004-03-08 Ken Raeburn * Makefile.in (MY_SUBDIRS): Deleted. diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in index 378438e13..ad2b999d9 100644 --- a/src/config-files/Makefile.in +++ b/src/config-files/Makefile.in @@ -7,4 +7,6 @@ all:: install:: $(INSTALL_DATA) $(srcdir)/kdc.conf.M ${DESTDIR}$(FILE_MANDIR)/kdc.conf.5 $(INSTALL_DATA) $(srcdir)/krb5.conf.M ${DESTDIR}$(FILE_MANDIR)/krb5.conf.5 - + $(INSTALL_DATA) $(srcdir)/kdc.conf ${DESTDIR}$(EXAMPLEDIR)/kdc.conf + $(INSTALL_DATA) $(srcdir)/krb5.conf ${DESTDIR}$(EXAMPLEDIR)/krb5.conf + $(INSTALL_DATA) $(srcdir)/services.append ${DESTDIR}$(EXAMPLEDIR)/services.append diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 0f4d61993..046123718 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,7 @@ +2004-10-06 Tom Yu + + * pre.in (datadir, EXAMPLEDIR): Add directory for examples. + 2004-09-22 Ken Raeburn * lib.in (binutils.versions, osf1.exports): New file targets. diff --git a/src/config/pre.in b/src/config/pre.in index db4e0582f..7d3e7a0b5 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -189,6 +189,9 @@ INSTALL_EXEC_PREFIX=@exec_prefix@ exec_prefix=@exec_prefix@ SHLIB_TAIL_COMP=@SHLIB_TAIL_COMP@ +datadir = @datadir@ +EXAMPLEDIR = $(datadir)/examples/krb5 + KRB5MANROOT = @mandir@ ADMIN_BINDIR = @sbindir@ SERVER_BINDIR = @sbindir@ -- 2.26.2