Author: rmeggins Update of /cvs/dirsec/ldapserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3235/ldapserver/wrappers Modified Files: dbscan.in ds_newinst.in dsktune.in infadd.in ldap-agent.in ldclt.in ldif.in migratecred.in mmldif.in pwdhash.in rsearch.in Log Message: 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 Index: dbscan.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/dbscan.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dbscan.in 24 Oct 2006 21:11:07 -0000 1.1 +++ dbscan.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nspr_libdir@:@db_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=dbscan-bin Index: ds_newinst.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ds_newinst.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_newinst.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ds_newinst.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -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 Index: dsktune.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/dsktune.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsktune.in 24 Oct 2006 21:11:07 -0000 1.1 +++ dsktune.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR= -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=dsktune-bin Index: infadd.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/infadd.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- infadd.in 24 Oct 2006 21:11:07 -0000 1.1 +++ infadd.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@bindir@ +BIN_DIR=@bindir@ COMMAND=infadd-bin Index: ldap-agent.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ldap-agent.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldap-agent.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ldap-agent.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@netsnmp_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=ldap-agent-bin Index: ldclt.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ldclt.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldclt.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ldclt.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@bindir@ +BIN_DIR=@bindir@ COMMAND=ldclt-bin Index: ldif.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ldif.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldif.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ldif.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=ldif-bin Index: migratecred.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/migratecred.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- migratecred.in 24 Oct 2006 21:11:07 -0000 1.1 +++ migratecred.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=migratecred-bin Index: mmldif.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/mmldif.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mmldif.in 24 Oct 2006 21:11:07 -0000 1.1 +++ mmldif.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=mmldif-bin Index: pwdhash.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/pwdhash.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pwdhash.in 24 Oct 2006 21:11:07 -0000 1.1 +++ pwdhash.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=pwdhash-bin Index: rsearch.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/rsearch.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rsearch.in 24 Oct 2006 21:11:07 -0000 1.1 +++ rsearch.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@bindir@ +BIN_DIR=@bindir@ COMMAND=rsearch-bin