Install example config files

ticket: 249

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b5653f7cf57237cb80db93ce90b9160a87089bd..fe47c6aebe321abbfd84142d62a714d66f5849e2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-06  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (INSTALLMKDIRS): Add EXAMPLEDIR.
+
 2004-10-05  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (KRB5_AC_ENABLE_THREADS): On HP-UX, define some

diff --git a/src/Makefile.in b/src/Makefile.in
index 8820b517ba256097831a41dab2d5d541aea7f916..225868eb6dc396d6cc3a4aba45c45b1eb9bbc774 100644 (file)
--- 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 80d6a9b7f8581004a21d7481019c56aab88fac94..42ddabcb231186ce22b948b7dfd07a57ecdedd0c 100644 (file)
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-06  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (install): Install example config files.
+
 2004-03-08  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (MY_SUBDIRS): Deleted.

diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in
index 378438e133fa3fd5dabb2cf4eaea3b8139d03ed9..ad2b999d9dd2793d9b3fea4f8423fc46e81e9031 100644 (file)
--- 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 0f4d6199376debe3d1a96bc699e09cb1620d1c14..0461237187234dda52833e4c18e0eb247f66a866 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-06  Tom Yu  <tlyu@mit.edu>
+
+       * pre.in (datadir, EXAMPLEDIR): Add directory for examples.
+
 2004-09-22  Ken Raeburn  <raeburn@mit.edu>
 
        * lib.in (binutils.versions, osf1.exports): New file targets.

diff --git a/src/config/pre.in b/src/config/pre.in
index db4e0582ff19e7326a31508230f87dc4ca2e4348..7d3e7a0b5fbf814f3621d6de19d94dabf72af697 100644 (file)
--- 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@