From 44ed8bab7f2de4b295a88230a35f66af72a12d18 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 7 Feb 2007 23:57:40 +0000 Subject: esolves: bug 227618 Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir Reviewed by: many people (Thanks!) Fix Description: In order to be more FHS compliant, we need to make the following changes: 1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc. 2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin) And, to be more packaging friendly, the additional changes: 3) move libback-ldbm to the plugins dir - it is a plugin 4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins I had to add support for sbindir and SBINDIR to create_instance and ds_newinst. We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself. These are now in 3 different places. The biggest change was to the scripts. I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff. I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew). I've tested instance creation with these diffs - everything seems to work fine. 5) reorder files in alphabetical order - suggested by nkinder 6) add $LDFLAGS to test in db.m4 7) touch all template/wrapper .in files to make them newer than their corresponding files Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes. --- ldap/admin/src/scripts/template-suffix2instance | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ldap/admin/src/scripts/template-suffix2instance') diff --git a/ldap/admin/src/scripts/template-suffix2instance b/ldap/admin/src/scripts/template-suffix2instance index f3642468..24b3385d 100644 --- a/ldap/admin/src/scripts/template-suffix2instance +++ b/ldap/admin/src/scripts/template-suffix2instance @@ -1,12 +1,12 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec export SHLIB_PATH -cd {{SERVER-DIR}} +cd {{SERVERBIN-DIR}} if [ $# -lt 2 ] then echo Usage: suffix2instance {-s includesuffix}* -- cgit