You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/05/05 17:07:38 UTC
svn commit: r1592547 - in /subversion/trunk: Makefile.in
build/generator/gen_make.py build/generator/templates/build-outputs.mk.ezt
Author: stsp
Date: Mon May 5 15:07:37 2014
New Revision: 1592547
URL: http://svn.apache.org/r1592547
Log:
Install pkg-config files.
* Makefile.in: Define $(pkgconfig_dir).
* build/generator/gen_make.py
(Generator.write.file_to_eztdata): Add fields for pkg-config data.
(Generator.write): Generate install rules for pkg-config files.
* build/generator/templates/build-outputs.mk.ezt:
Add pkg-config install rule templates.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build/generator/gen_make.py
subversion/trunk/build/generator/templates/build-outputs.mk.ezt
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1592547&r1=1592546&r2=1592547&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Mon May 5 15:07:37 2014
@@ -88,6 +88,9 @@ swig_pldir = @libdir@/svn-perl
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
toolsdir = @bindir@/svn-tools
+# where to install pkg-config files
+pkgconfig_dir = $(datadir)/pkgconfig
+
javahl_javadir = @libdir@/svn-javahl
javahl_javahdir = @libdir@/svn-javahl/include
javahl_libdir = @libdir@
Modified: subversion/trunk/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1592547&r1=1592546&r2=1592547&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Mon May 5 15:07:37 2014
@@ -382,7 +382,10 @@ class Generator(gen_base.GeneratorBase):
dirname, fname = build_path_splitfile(file.filename)
return _eztdata(mode=None,
dirname=dirname, fullname=file.filename,
- filename=fname, when=file.when)
+ filename=fname, when=file.when,
+ pc_fullname=None,
+ pc_installdir=None,
+ pc_install_fname=None,)
def apache_file_to_eztdata(file):
# cd to dirname before install to work around libtool 1.4.2 bug.
@@ -415,6 +418,15 @@ class Generator(gen_base.GeneratorBase):
else:
ezt_file.install_fname = build_path_join('$(%sdir)' % area_var,
ezt_file.filename)
+
+ # Install pkg-config files
+ if (isinstance(file.target, gen_base.TargetLib) and
+ ezt_file.fullname.startswith('subversion/libsvn_')):
+ ezt_file.pc_fullname = ezt_file.fullname.replace('-1.la', '.pc')
+ ezt_file.pc_installdir = '$(pkgconfig_dir)'
+ pc_install_fname = ezt_file.filename.replace('-1.la', '.pc')
+ ezt_file.pc_install_fname = build_path_join(ezt_file.pc_installdir,
+ pc_install_fname)
ezt_area.files.append(ezt_file)
# certain areas require hooks for extra install rules defined
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=1592547&r1=1592546&r2=1592547&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/build-outputs.mk.ezt (original)
+++ subversion/trunk/build/generator/templates/build-outputs.mk.ezt Mon May 5 15:07:37 2014
@@ -130,9 +130,10 @@ $([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][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]
[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][end][end]
+ [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]
[end][else] $(MKDIR) $(DESTDIR)$([areas.varname]dir)
[end][if-any areas.extra_install] $(INSTALL_EXTRA_[areas.uppervar])
[end][end]