Bug(s) fixed: 213352

Bug Description: autotools: support redhat/fedora rpmbuild %configure
and %makeinstall
Reviewed by: nhosoi (Thanks!)
Fix Description: The standard way to do an rpmbuild on fedora/redhat is
to use the %configure
macro in the %prep section of the spec file and the %makeinstall macro
in the
%install section.  These set all of the bindir, libdir, datadir, sysconfdir,
etc. paths used by the application.  %configure sets them to their "real"
runtime locations e.g. /usr/lib, and %makeinstall sets them to their
paths used
for rpm packaging e.g. /var/tmp/fedora-ds-foo-bar-baz/usr/lib.  There
were a few
places in our autotools files where we were running afoul of this.

Another thing is that configure defines bindir etc. as literally
'${exec_prefix}/bin' so that the real value doesn't get expanded until
make or
make install time.  This means that we cannot create scripts from
templates in
configure, we have to do that in make.  So this adds a sed command to
Makefile.am in order to do all of the script and config file path
replacement at
make time.

Since we do the subst this way, whatever $prefix is set during make will be
incorporated into the value of $bindir etc. so we can omit directly
referencing
@prefix@ in the template files.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no

11 files changed, 12 insertions, 12 deletions

diff --git a/wrappers/dbscan.in b/wrappers/dbscan.in
index 5592a1b6..511ca693 100755
--- a/wrappers/dbscan.in
+++ b/wrappers/dbscan.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nspr_libdir@:@db_libdir@
-BIN_DIR=@prefix@@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=dbscan-bin
 
 
diff --git a/wrappers/ds_newinst.in b/wrappers/ds_newinst.in
index 760144a7..1da7c708 100755
--- a/wrappers/ds_newinst.in
+++ b/wrappers/ds_newinst.in
@@ -4,8 +4,8 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@prefix@@serverdir@
-BIN_DIR=@prefix@@serverdir@
+LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=ds_newinst-bin
 
 
diff --git a/wrappers/dsktune.in b/wrappers/dsktune.in
index bb0b6ba2..f04fbd58 100755
--- a/wrappers/dsktune.in
+++ b/wrappers/dsktune.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=
-BIN_DIR=@prefix@@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=dsktune-bin
 
 
diff --git a/wrappers/infadd.in b/wrappers/infadd.in
index dd6df8c4..89eb0ea7 100755
--- a/wrappers/infadd.in
+++ b/wrappers/infadd.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@prefix@@bindir@
+BIN_DIR=@bindir@
 COMMAND=infadd-bin
 
 
diff --git a/wrappers/ldap-agent.in b/wrappers/ldap-agent.in
index 3bd2ae11..c3f8c5ff 100755
--- a/wrappers/ldap-agent.in
+++ b/wrappers/ldap-agent.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@netsnmp_libdir@
-BIN_DIR=@prefix@@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=ldap-agent-bin
 
 
diff --git a/wrappers/ldclt.in b/wrappers/ldclt.in
index cbea22fe..ecc50bf6 100755
--- a/wrappers/ldclt.in
+++ b/wrappers/ldclt.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@prefix@@bindir@
+BIN_DIR=@bindir@
 COMMAND=ldclt-bin
 
 
diff --git a/wrappers/ldif.in b/wrappers/ldif.in
index 6f52692c..d04227f5 100755
--- a/wrappers/ldif.in
+++ b/wrappers/ldif.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@prefix@@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=ldif-bin
 
 
diff --git a/wrappers/migratecred.in b/wrappers/migratecred.in
index ca8e7bde..f7487c69 100755
--- a/wrappers/migratecred.in
+++ b/wrappers/migratecred.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@prefix@@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=migratecred-bin
 
 
diff --git a/wrappers/mmldif.in b/wrappers/mmldif.in
index 55df10b3..35b995d3 100755
--- a/wrappers/mmldif.in
+++ b/wrappers/mmldif.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@prefix@@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=mmldif-bin
 
 
diff --git a/wrappers/pwdhash.in b/wrappers/pwdhash.in
index b6394521..94e6bc87 100755
--- a/wrappers/pwdhash.in
+++ b/wrappers/pwdhash.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@prefix@@serverdir@
+BIN_DIR=@serverdir@
 COMMAND=pwdhash-bin
 
 
diff --git a/wrappers/rsearch.in b/wrappers/rsearch.in
index fd776d4e..cebecf1f 100755
--- a/wrappers/rsearch.in
+++ b/wrappers/rsearch.in
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@prefix@@bindir@
+BIN_DIR=@bindir@
 COMMAND=rsearch-bin