Author: lmuelle Date: 2006-03-21 16:18:34 +0000 (Tue, 21 Mar 2006) New Revision: 14626
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14626 Log: Only set libdir and mandir to the defaults if we haven't used --libdir or --mandir to set them already. Till now we overwrrote a setting made with --libdir or --mandir. Modified: branches/SAMBA_3_0/source/configure.in trunk/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2006-03-21 15:38:27 UTC (rev 14625) +++ branches/SAMBA_3_0/source/configure.in 2006-03-21 16:18:34 UTC (rev 14626) @@ -25,10 +25,10 @@ rootsbindir="\${SBINDIR}" lockdir="\${VARDIR}/locks" piddir="\${VARDIR}/locks" -mandir="\${prefix}/man" +test "${mandir}" || mandir="\${prefix}/man" logfilebase="\${VARDIR}" privatedir="\${prefix}/private" -libdir="\${prefix}/lib" +test "${libdir}" || libdir="\${prefix}/lib" configdir="\${LIBDIR}" swatdir="\${prefix}/swat" Modified: trunk/source/configure.in =================================================================== --- trunk/source/configure.in 2006-03-21 15:38:27 UTC (rev 14625) +++ trunk/source/configure.in 2006-03-21 16:18:34 UTC (rev 14626) @@ -25,10 +25,10 @@ rootsbindir="\${SBINDIR}" lockdir="\${VARDIR}/locks" piddir="\${VARDIR}/locks" -mandir="\${prefix}/man" +test "${mandir}" || mandir="\${prefix}/man" logfilebase="\${VARDIR}" privatedir="\${prefix}/private" -libdir="\${prefix}/lib" +test "${libdir}" || libdir="\${prefix}/lib" configdir="\${LIBDIR}" swatdir="\${prefix}/swat"
