[Fedora-directory-commits] ldapserver configure, 1.61, 1.62 configure.ac, 1.36, 1.37

[Nathan Kinder (nkinder)]

Author: nkinder

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

Modified Files:
	configure configure.ac 
Log Message:
Resolves: 253818
Summary: Support FHS opt layout for perldir and propertydir.



Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- configure	20 Aug 2007 17:49:17 -0000	1.61
+++ configure	22 Aug 2007 05:11:34 -0000	1.62
@@ -23160,6 +23160,10 @@
   serverplugindir=/plugins
   # relative to datadir
   infdir=/inf
+  # location of property/resource files, relative to datadir
+  propertydir=/properties
+  # relative to libdir
+  perldir=/perl
 else
   if test "$with_fhs" = "yes"; then
     ac_default_prefix=/usr
@@ -23178,17 +23182,17 @@
   serverplugindir=/$PACKAGE_NAME/plugins
   # relative to datadir
   infdir=/$PACKAGE_NAME/inf
+  # location of property/resource files, relative to datadir
+  propertydir=/$PACKAGE_NAME/properties
+  # relative to libdir
+  perldir=/$PACKAGE_NAME/perl
 fi
 
 # Shared paths for all layouts
 # relative to sysconfdir
 configdir=/$PACKAGE_NAME/config
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_NAME/properties
 # relative to sysconfdir
 schemadir=/$PACKAGE_NAME/schema
-# relative to libdir
-perldir=/$PACKAGE_NAME/perl
 
 # default user, group
 defaultuser=nobody


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- configure.ac	13 Aug 2007 15:35:35 -0000	1.36
+++ configure.ac	22 Aug 2007 05:11:34 -0000	1.37
@@ -165,6 +165,10 @@
   serverplugindir=/plugins
   # relative to datadir
   infdir=/inf
+  # location of property/resource files, relative to datadir
+  propertydir=/properties
+  # relative to libdir
+  perldir=/perl
 else
   if test "$with_fhs" = "yes"; then
     ac_default_prefix=/usr
@@ -185,17 +189,17 @@
   serverplugindir=/$PACKAGE_NAME/plugins
   # relative to datadir
   infdir=/$PACKAGE_NAME/inf
+  # location of property/resource files, relative to datadir
+  propertydir=/$PACKAGE_NAME/properties
+  # relative to libdir
+  perldir=/$PACKAGE_NAME/perl
 fi
 
 # Shared paths for all layouts
 # relative to sysconfdir
 configdir=/$PACKAGE_NAME/config
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_NAME/properties
 # relative to sysconfdir
 schemadir=/$PACKAGE_NAME/schema
-# relative to libdir
-perldir=/$PACKAGE_NAME/perl
 
 # default user, group
 defaultuser=nobody