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

Makefile.am

@@ -60,7 +60,7 @@ propertydir = $(sysconfdir)@propertydir@
 schemadir = $(sysconfdir)@schemadir@
 serverdir = $(libdir)@serverdir@
 serverplugindir = $(libdir)@serverplugindir@
-taskdir = $(sysconfdir)@scripttemplatedir@
+taskdir = $(datadir)@scripttemplatedir@
 
 #------------------------
 # Build Products

Makefile.in

@@ -951,7 +951,7 @@ PAM_LINK = -lpam
 #------------------------
 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 \

configure

@@ -24602,7 +24602,7 @@ schemadir=/fedora-ds/schema
 serverdir=/fedora-ds
 # relative to libdir
 serverplugindir=/fedora-ds/plugins
-# relative to sysconfdir
+# relative to datadir
 scripttemplatedir=/fedora-ds/script-templates
 
 

configure.ac

@@ -130,7 +130,7 @@ schemadir=/fedora-ds/schema
 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)

ldap/admin/src/create_instance.c

@@ -708,7 +708,7 @@ char *gen_script_auto(char *s_root, char *cs_path,
     }
 
     PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
-            cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
+            cf->datadir, FILE_PATHSEP, cf->brand_ds,
             FILE_PATHSEP, FILE_PATHSEP, name);
     PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name);
     create_instance_mkdir(cs_path, NEWDIR_MODE);
@@ -774,7 +774,7 @@ char *gen_perl_script_auto_for_migration(char *s_root, char *cs_path, char *name
     int fnlen = 0;
 
     PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
-            cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
+            cf->datadir, FILE_PATHSEP, cf->brand_ds,
             FILE_PATHSEP, FILE_PATHSEP, name);
     PR_snprintf(fn, sizeof(fn),   "%s%c%s%cbin",
             cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);