aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2004-10-07 00:00:25 +0000
committerTom Yu <tlyu@mit.edu>2004-10-07 00:00:25 +0000
commitf4e8ab562c89578aec48e21349b7d80eccc87387 (patch)
tree3fb3ad67909e1665d4b0834613e4d6d62b8bf377 /src
parent054856b97becdce9591dfb470eb1e53016006d82 (diff)
downloadkrb5-f4e8ab562c89578aec48e21349b7d80eccc87387.zip
krb5-f4e8ab562c89578aec48e21349b7d80eccc87387.tar.gz
krb5-f4e8ab562c89578aec48e21349b7d80eccc87387.tar.bz2
Install example config files
ticket: 249 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16810 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in2
-rw-r--r--src/config-files/ChangeLog4
-rw-r--r--src/config-files/Makefile.in4
-rw-r--r--src/config/ChangeLog4
-rw-r--r--src/config/pre.in3
6 files changed, 19 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b5653f..fe47c6a 100644
--- 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 8820b51..225868e 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 80d6a9b..42ddabc 100644
--- 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 378438e..ad2b999 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 0f4d619..0461237 100644
--- 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 db4e058..7d3e7a0 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@