diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-14 13:32:10 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-14 13:32:10 +0000 |
commit | 320806c04be3fba38b75ff06979e45316ce84047 (patch) | |
tree | 1fcf033704e388683d6e8133a33dd2303ec8ce9a /Build/source/texk/kpathsea | |
parent | 2069d48ccbd0a68b9889261b7a474f54faf1206b (diff) |
texk/kpathsea: Install <kpathsea/c-auto.h> in an architecture dependent location
git-svn-id: svn://tug.org/texlive/trunk@36510 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.in | 62 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/NEWS | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/kpathsea.pc.in | 2 |
5 files changed, 60 insertions, 21 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 656b42ce232..18ee908215a 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2015-03-14 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, kpathsea.pc.in: Install <kpathsea/c-auto.h> under + ${libdir}. + 2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Drop checks for strcasecmp, strtol, and strstr. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index e72d1037b56..aaea3ed6321 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -111,10 +111,14 @@ EXTRA_DIST += \ kpseincludedir = ${includedir}/kpathsea nodist_kpseinclude_HEADERS = \ - c-auto.h \ kpathsea.h \ paths.h +kpselibincludedir = ${libdir}/kpathsea + +nodist_kpselibinclude_HEADERS = \ + c-auto.h + kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers) # Headers included directly into kpathsea.h diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 92a7cb88c3b..8b0119557a2 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -172,7 +172,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \ - "$(DESTDIR)$(kpseincludedir)" + "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS) am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.c \ @@ -307,7 +307,7 @@ am__can_run_installinfo = \ esac DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA) HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \ - $(noinst_HEADERS) + $(nodist_kpselibinclude_HEADERS) $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -716,10 +716,13 @@ libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.c \ $(am__append_5) $(am__append_7) kpseincludedir = ${includedir}/kpathsea nodist_kpseinclude_HEADERS = \ - c-auto.h \ kpathsea.h \ paths.h +kpselibincludedir = ${libdir}/kpathsea +nodist_kpselibinclude_HEADERS = \ + c-auto.h + kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers) # Headers included directly into kpathsea.h @@ -1618,6 +1621,27 @@ uninstall-nodist_kpseincludeHEADERS: @list='$(nodist_kpseinclude_HEADERS)'; test -n "$(kpseincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(kpseincludedir)'; $(am__uninstall_files_from_dir) +install-nodist_kpselibincludeHEADERS: $(nodist_kpselibinclude_HEADERS) + @$(NORMAL_INSTALL) + @list='$(nodist_kpselibinclude_HEADERS)'; test -n "$(kpselibincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(kpselibincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(kpselibincludedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(kpselibincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(kpselibincludedir)" || exit $$?; \ + done + +uninstall-nodist_kpselibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_kpselibinclude_HEADERS)'; test -n "$(kpselibincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(kpselibincludedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -2079,7 +2103,7 @@ install-binPROGRAMS: install-libLTLIBRARIES installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -2145,7 +2169,8 @@ info-am: install-data-am: install-data-local install-dist_web2cDATA \ install-dist_web2cSCRIPTS install-kpseincludeHEADERS \ - install-nodist_kpseincludeHEADERS install-pkgconfigDATA + install-nodist_kpseincludeHEADERS \ + install-nodist_kpselibincludeHEADERS install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -2198,7 +2223,8 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \ uninstall-dist_web2cSCRIPTS uninstall-kpseincludeHEADERS \ uninstall-libLTLIBRARIES uninstall-local \ - uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA + uninstall-nodist_kpseincludeHEADERS \ + uninstall-nodist_kpselibincludeHEADERS uninstall-pkgconfigDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(am__recursive_targets) all check check-am install install-am \ @@ -2219,17 +2245,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \ install-exec-local install-html install-html-am install-info \ install-info-am install-kpseincludeHEADERS \ install-libLTLIBRARIES install-man \ - install-nodist_kpseincludeHEADERS install-pdf install-pdf-am \ - install-pkgconfigDATA install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am recheck tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-dist_web2cDATA \ - uninstall-dist_web2cSCRIPTS uninstall-hook \ - uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \ - uninstall-local uninstall-nodist_kpseincludeHEADERS \ - uninstall-pkgconfigDATA + install-nodist_kpseincludeHEADERS \ + install-nodist_kpselibincludeHEADERS install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-dist_web2cDATA uninstall-dist_web2cSCRIPTS \ + uninstall-hook uninstall-kpseincludeHEADERS \ + uninstall-libLTLIBRARIES uninstall-local \ + uninstall-nodist_kpseincludeHEADERS \ + uninstall-nodist_kpselibincludeHEADERS uninstall-pkgconfigDATA .PRECIOUS: Makefile diff --git a/Build/source/texk/kpathsea/NEWS b/Build/source/texk/kpathsea/NEWS index 9f07c014e24..00c85b444e2 100644 --- a/Build/source/texk/kpathsea/NEWS +++ b/Build/source/texk/kpathsea/NEWS @@ -1,9 +1,11 @@ This file records noteworthy changes. (Public domain.) -(for TeX Live 2015) +6.2.1 (for TeX Live 2015) * kpsewhich --help outputs more information the search paths. +* install <kpatsea/c-auto.h> in an architecture dependent location + and use pkg-config to get the required flags. -6.2.0 (for TeX Live 2014) +6.2.0 (for TeX Live 2014, 30 May 2013) * mktexlsr outputs normal msgs to stdout instead of stderr. * do not ignore a non-terminated last line of a file. * new texmf.cnf variables SELFAUTOGRANDPARENT, guess_input_kanji_encoding. diff --git a/Build/source/texk/kpathsea/kpathsea.pc.in b/Build/source/texk/kpathsea/kpathsea.pc.in index 865f5408ab5..63ac7724177 100644 --- a/Build/source/texk/kpathsea/kpathsea.pc.in +++ b/Build/source/texk/kpathsea/kpathsea.pc.in @@ -7,5 +7,5 @@ Name: kpathsea Description: Kpathsea filename lookup library Version: @KPSEVERSION@ Libs: -L${libdir} -lkpathsea -Cflags: -I${includedir} +Cflags: -I${libdir} -I${includedir} |