paul at city-fan
Sep 25, 2009, 1:13 AM
Post #2 of 2
(230 views)
Permalink
|
|
Re: svn commit: r818242 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID Makefile.apxs
[In reply to]
|
|
On 24/09/09 21:37, William A. Rowe, Jr. wrote:
> Guys, I think we missed one...
>
> trawick [at] apache wrote:
>> Author: trawick
>> Date: Wed Sep 23 20:31:44 2009
>> New Revision: 818242
>>
>> URL: http://svn.apache.org/viewvc?rev=818242&view=rev
>> Log:
>> Fix a make install DESTDIR problem handling the reference manual.
>> The currently-unused rule for installing header files was also
>> fixed.
>>
>> This only affected our 2.3.1 beta release.
>>
>> Submitted by: Paul Howarth<paul city-fan.org>
>> Reviewed by: trawick
>>
>> Modified:
>> httpd/mod_fcgid/trunk/CHANGES-FCGID
>> httpd/mod_fcgid/trunk/Makefile.apxs
>>
>> Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
>> URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=818242&r1=818241&r2=818242&view=diff
>> ==============================================================================
>> --- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
>> +++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Wed Sep 23 20:31:44 2009
>> @@ -1,6 +1,10 @@
>> -*- coding: utf-8 -*-
>> Changes with mod_fcgid 2.3.2
>>
>> + *) Fix a make install DESTDIR problem handling the reference manual and
>> + potentially other files (specific to 2.3.1).
>> + [Paul Howarth<paul city-fan.org>]
>> +
>> *) Fix a mod_fcgid 2.3.1 failure with<sys/mutex.h> when building for
>> httpd 2.0.x on some platforms. [Paul Howarth<paul city-fan.org>]
>>
>>
>> Modified: httpd/mod_fcgid/trunk/Makefile.apxs
>> URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/Makefile.apxs?rev=818242&r1=818241&r2=818242&view=diff
>> ==============================================================================
>> --- httpd/mod_fcgid/trunk/Makefile.apxs (original)
>> +++ httpd/mod_fcgid/trunk/Makefile.apxs Wed Sep 23 20:31:44 2009
>
> Before these changes, below, Makefile.apxs offers up;
>
> httpd_conffile=$(exp_sysconfdir)/$(progname).conf
>
> which is used later in the makefile for;
> @awk -f $(fcgid_srcdir)/build/addloadexample.awk \
> -v MODULE=fcgid -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
> -v EXAMPLECONF=$(rel_sysconfdir)/extra/httpd-fcgid.conf \
> $(httpd_conffile)> $(httpd_conffile).new&& \
> ( mv $(httpd_conffile) $(httpd_conffile).bak&& \
> mv $(httpd_conffile).new $(httpd_conffile) );
>
> Won't this need to be changed also to?
>
> httpd_conffile=$(DESTDIR)$(exp_sysconfdir)/$(progname).conf
>
> I have a commit ready if you confirm.
I think it's best to prepend $(DESTDIR) in front of any reference to
$(httpd_conffile) on the destination. Whilst this is more long-winded
than simply adding $(DESTDIR) into $(httpd_conffile) at source, it
avoids errors that might creep in if the value of $(httpd_conffile) was
used in any other context, such as embedding it into documentation or
startup scripts, where you don't want to see $(DESTDIR).
Paul.
|
