On Tue, Apr 09, 2013 at 10:11:53AM -0400, Alan Conway wrote: > On 04/08/2013 10:05 AM, Darryl L. Pierce wrote: > >Fixes needed for the CMake build system when installing files. > > > >Corrects the installation for several pieces, including Python site > >packages, a couple of configuration files and a SysVInit script. > > > >http://issues.apache.org/jira/browse/QPID-4698 > > > > Should the last line also be changed to use @...@?
You're right. I missed that since it was in the comment. > > --- qpid/trunk/qpid/cpp/etc/qpidd-primary.in 2013/04/08 14:01:44 1465642 > +++ qpid/trunk/qpid/cpp/etc/qpidd-primary.in 2013/04/08 14:02:18 1465643 > @@ -40,8 +40,8 @@ > # Source function library. > . /etc/rc.d/init.d/functions > > -if [ -f !!sysconfdir!!/sysconfig/$prog ] ; then > - . !!sysconfdir!!/sysconfig/$prog > +if [ -f @sysconfdir@/sysconfig/$prog ] ; then > + . @sysconfdir@/sysconfig/$prog > fi > > # The following variables can be overridden in !!sysconfdir!!/sysconfig/$prog -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/
pgpsiDoYfXTss.pgp
Description: PGP signature
