Author: stsp
Date: Wed May 28 12:05:36 2014
New Revision: 1597985
URL: http://svn.apache.org/r1597985
Log:
For issue #4507, "pkg-config support breaks DESTDIR install", prepend
$(DESTDIR) to pkg-config file paths. 'make DESTDIR=/foo install' now
installs pkg-config files within /foo, as intended.
* build/generator/templates/build-outputs.mk.ezt: Prepend $(DESTDIR) to
pkg-config files.
Modified:
subversion/trunk/build/generator/templates/build-outputs.mk.ezt
Modified: subversion/trunk/build/generator/templates/build-outputs.mk.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/build-outputs.mk.ezt?rev=1597985&r1=1597984&r2=1597985&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/build-outputs.mk.ezt (original)
+++ subversion/trunk/build/generator/templates/build-outputs.mk.ezt Wed May 28
12:05:36 2014
@@ -130,7 +130,7 @@ $([target.varname]_OBJECTS): $([target.v
########################################
[for areas]
install-[areas.type]: [for areas.files][if-index areas.files first][else]
[end][areas.files.fullname][end]
-[if-any areas.files][for areas.files] [is areas.files.mode
"apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then
[else][end]cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ;
$(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any
areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR)
$(DESTDIR)$([areas.varname]dir)[if-any areas.files.pc_installdir]
[areas.files.pc_installdir][end]
+[if-any areas.files][for areas.files] [is areas.files.mode
"apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then
[else][end]cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ;
$(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any
areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR)
$(DESTDIR)$([areas.varname]dir)[if-any areas.files.pc_installdir]
$(DESTDIR)[areas.files.pc_installdir][end]
[else][end][is areas.type "locale"]$(MKDIR) [areas.files.installdir]
[if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd
[areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename]
[areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any
areas.files.when] ; fi[else][end][else][if-any areas.files.when]if
$([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ;
$(INSTALL_[areas.uppervar]) [areas.files.filename]
$(DESTDIR)[areas.files.install_fname][if-any areas.files.when] ; fi[else][end]
[if-any areas.files.pc_fullname]$(INSTALL_DATA)
[areas.files.pc_fullname]
$(DESTDIR)[areas.files.pc_install_fname][end][end][end]
