diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ldap/admin/src/create_instance.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 4de0cfdf..9feb53e5 100644 --- a/Makefile.am +++ b/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 diff --git a/Makefile.in b/Makefile.in index 01618bcc..57f4fed8 100644 --- a/Makefile.in +++ b/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 \ @@ -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 diff --git a/configure.ac b/configure.ac index fa3f0a06..b4b35c35 100644 --- a/configure.ac +++ b/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) diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c index 86ca3fa0..be353c2f 100644 --- a/ldap/admin/src/create_instance.c +++ b/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); |