summaryrefslogtreecommitdiffstats
path: root/ldap/admin/src/create_instance.h
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2007-02-07 23:57:40 +0000
committerRich Megginson <rmeggins@redhat.com>2007-02-07 23:57:40 +0000
commit44ed8bab7f2de4b295a88230a35f66af72a12d18 (patch)
treebb57e6674feead6fe0598ddf092141af53591ebe /ldap/admin/src/create_instance.h
parent67be3511d41496ed3c26f082cbf1eb06d96003cb (diff)
downloadds-44ed8bab7f2de4b295a88230a35f66af72a12d18.tar.gz
ds-44ed8bab7f2de4b295a88230a35f66af72a12d18.tar.xz
ds-44ed8bab7f2de4b295a88230a35f66af72a12d18.zip
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.
Diffstat (limited to 'ldap/admin/src/create_instance.h')
-rw-r--r--ldap/admin/src/create_instance.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/ldap/admin/src/create_instance.h b/ldap/admin/src/create_instance.h
index f3eac0ea..7629f8c6 100644
--- a/ldap/admin/src/create_instance.h
+++ b/ldap/admin/src/create_instance.h
@@ -74,6 +74,9 @@ extern "C" { /* Assume C declarations for C++ */
#ifndef BINDIR
#define BINDIR "/usr/bin"
#endif
+#ifndef SBINDIR
+#define SBINDIR "/usr/sbin"
+#endif
#ifndef DATADIR
#define DATADIR "/usr/share"
#endif
@@ -87,6 +90,9 @@ extern "C" { /* Assume C declarations for C++ */
#ifndef BINDIR
#define BINDIR "/bin"
#endif
+#ifndef SBINDIR
+#define SBINDIR "/sbin"
+#endif
#ifndef DATADIR
#define DATADIR "/share"
#endif
@@ -101,6 +107,7 @@ extern "C" { /* Assume C declarations for C++ */
#define SYSCONFDIR "\\etc"
#define LIBDIR "\\usr\\lib"
#define BINDIR "\\usr\\bin"
+#define SBINDIR "\\usr\\sbin"
#define DATADIR "\\usr\\share"
#define DOCDIR "\\usr\\doc"
#endif
@@ -110,6 +117,7 @@ typedef struct {
char *localstatedir;
char *sysconfdir;
char *bindir;
+ char *sbindir;
char *datadir;
char *docdir;