Hi Ken,
This commit is causing problems for RPM builds... libexecdir no
longer points where it was intended. I don't follow the reason
for the change though, since debian/rules already has a setting
for libexecdir:
git show f0bf4abe6b5ffff814c5f63105610efec622768d
commit f0bf4abe6b5ffff814c5f63105610efec622768d
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Nov 20 07:00:39 2012 +1100
Makepkgs - explicitly set --libexecdir for configure
For the non-RPM builds (especially the Debian-based ones) need
to explicitly set --libexecdir=/usr/lib to retain historical path
settings for pmlogger and friends in $PCP_BINADM_DIR
diff --git a/Makepkgs b/Makepkgs
index 51b35dd..15dbeb8 100755
--- a/Makepkgs
+++ b/Makepkgs
@@ -161,9 +161,9 @@ echo "== Building pcp, log is in $LOGF"
if [ "$VERS" = MINGW ]
then
- configured="--prefix=/usr --sysconfdir=/etc --localstatedir=/var
--with-rcdir=/etc/init.d --disable-ssp"
+ configured="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc
--localstatedir=/var --with-rcdir=/etc/init.d --disable-ssp"
else
- configured="--prefix=/usr --sysconfdir=/etc --localstatedir=/var
--with-rcdir=/etc/init.d"
+ configured="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc
--localstatedir=/var --with-rcdir=/etc/init.d"
fi
grep libexecdir debian/rules
configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc
--localstatedir=/var --with-rcdir=/etc/init.d --with-tmpdir=/var/lib/pcp/tmp
I'm confused. Was the debian/rules setting somehow not being used?
cheers.
--
Nathan
|