[Fedora-directory-commits] ldapserver Makefile.am, 1.15, 1.16 Makefile.in, 1.16, 1.17 configure, 1.16, 1.17 configure.ac, 1.12, 1.13 aclocal.m4, 1.7, 1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023/ldapserver

Modified Files:
	Makefile.am Makefile.in configure configure.ac aclocal.m4 
Log Message:
Resolves: bug 224291
Bug Description: Move script-templates from sysconfdir to datadir
Reviewed by: nkinder, dennis (Thanks!)
Files: see diff
Branch: HEAD
Fix Description: Just change sysconfdir to datadir in both the Makefile.am (which controls where the files are put during installation) and in create_instance.c (which controls where instance creation looks for the templates to use them to create the real scripts).
Platforms tested: RHEL4
Flag Day: no
Doc impact: no 



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am	12 Jan 2007 16:18:14 -0000	1.15
+++ Makefile.am	25 Jan 2007 16:47:45 -0000	1.16
@@ -60,7 +60,7 @@
 schemadir = $(sysconfdir)@schemadir@
 serverdir = $(libdir)@serverdir@
 serverplugindir = $(libdir)@serverplugindir@
-taskdir = $(sysconfdir)@scripttemplatedir@
+taskdir = $(datadir)@scripttemplatedir@
 
 #------------------------
 # Build Products


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in	12 Jan 2007 16:18:14 -0000	1.16
+++ Makefile.in	25 Jan 2007 16:47:45 -0000	1.17
@@ -951,7 +951,7 @@
 #------------------------
 BUILT_SOURCES = dirver.h dberrstrs.h
 CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
-taskdir = $(sysconfdir)@scripttemplatedir@
+taskdir = $(datadir)@scripttemplatedir@
 server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la
 serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \
 	libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \


Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure	12 Jan 2007 16:18:15 -0000	1.16
+++ configure	25 Jan 2007 16:47:45 -0000	1.17
@@ -24602,7 +24602,7 @@
 serverdir=/fedora-ds
 # relative to libdir
 serverplugindir=/fedora-ds/plugins
-# relative to sysconfdir
+# relative to datadir
 scripttemplatedir=/fedora-ds/script-templates
 
 


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.ac	12 Jan 2007 16:18:15 -0000	1.12
+++ configure.ac	25 Jan 2007 16:47:45 -0000	1.13
@@ -130,7 +130,7 @@
 serverdir=/fedora-ds
 # relative to libdir
 serverplugindir=/fedora-ds/plugins
-# relative to sysconfdir
+# relative to datadir
 scripttemplatedir=/fedora-ds/script-templates
 AC_SUBST(configdir)
 AC_SUBST(sampledatadir)