You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/09/23 22:31:44 UTC

svn commit: r818242 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID Makefile.apxs

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
@@ -94,21 +94,21 @@
 
 install-manual:
 	@echo Installing online manual
-	@test -d $(exp_manualdir) \
-          || $(MKINSTALLDIRS) $(exp_manualdir)
+	@test -d $(DESTDIR)$(exp_manualdir) \
+          || $(MKINSTALLDIRS) $(DESTDIR)$(exp_manualdir)
 	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 	  $(RSYNC) --exclude .svn -rlpt --numeric-ids \
-		$(fcgid_srcdir)/docs/manual/ $(exp_manualdir)/; \
+		$(fcgid_srcdir)/docs/manual/ $(DESTDIR)$(exp_manualdir)/; \
 	else \
-	  cp -rp $(fcgid_srcdir)/docs/manual/* $(exp_manualdir)/ && \
-	  find $(exp_manualdir) -name ".svn" -type d -print \
+	  cp -rp $(fcgid_srcdir)/docs/manual/* $(DESTDIR)$(exp_manualdir)/ && \
+	  find $(DESTDIR)$(exp_manualdir) -name ".svn" -type d -print \
 	    | xargs rm -rf 2>/dev/null || true; \
 	fi
 
 install-include:
 	@echo Installing header files
-	@$(MKINSTALLDIRS) $(exp_includedir) && \
-	  cp $(fcgid_srcdir)/include/mod_fcgid.h $(exp_includedir)/ && \
-	  chmod 0644 $(exp_includedir)/mod_fcgid.h
+	@$(MKINSTALLDIRS) $(DESTDIR)$(exp_includedir) && \
+	  cp $(fcgid_srcdir)/include/mod_fcgid.h $(DESTDIR)$(exp_includedir)/ && \
+	  chmod 0644 $(DESTDIR)$(exp_includedir)/mod_fcgid.h
 
 .PHONY: generate-dox generate-docs

Re: svn commit: r818242 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID Makefile.apxs

Posted by Paul Howarth <pa...@city-fan.org>.
On 24/09/09 21:37, William A. Rowe, Jr. wrote:
> Guys, I think we missed one...
>
> trawick@apache.org 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.

Re: svn commit: r818242 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID Makefile.apxs

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Guys, I think we missed one...

trawick@apache.org 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.

> @@ -94,21 +94,21 @@
>  
>  install-manual:
>  	@echo Installing online manual
> -	@test -d $(exp_manualdir) \
> -          || $(MKINSTALLDIRS) $(exp_manualdir)
> +	@test -d $(DESTDIR)$(exp_manualdir) \
> +          || $(MKINSTALLDIRS) $(DESTDIR)$(exp_manualdir)
>  	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
>  	  $(RSYNC) --exclude .svn -rlpt --numeric-ids \
> -		$(fcgid_srcdir)/docs/manual/ $(exp_manualdir)/; \
> +		$(fcgid_srcdir)/docs/manual/ $(DESTDIR)$(exp_manualdir)/; \
>  	else \
> -	  cp -rp $(fcgid_srcdir)/docs/manual/* $(exp_manualdir)/ && \
> -	  find $(exp_manualdir) -name ".svn" -type d -print \
> +	  cp -rp $(fcgid_srcdir)/docs/manual/* $(DESTDIR)$(exp_manualdir)/ && \
> +	  find $(DESTDIR)$(exp_manualdir) -name ".svn" -type d -print \
>  	    | xargs rm -rf 2>/dev/null || true; \
>  	fi
>  
>  install-include:
>  	@echo Installing header files
> -	@$(MKINSTALLDIRS) $(exp_includedir) && \
> -	  cp $(fcgid_srcdir)/include/mod_fcgid.h $(exp_includedir)/ && \
> -	  chmod 0644 $(exp_includedir)/mod_fcgid.h
> +	@$(MKINSTALLDIRS) $(DESTDIR)$(exp_includedir) && \
> +	  cp $(fcgid_srcdir)/include/mod_fcgid.h $(DESTDIR)$(exp_includedir)/ && \
> +	  chmod 0644 $(DESTDIR)$(exp_includedir)/mod_fcgid.h
>  
>  .PHONY: generate-dox generate-docs
> 
> 
> 
>