diff options
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.am | 9 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.in | 45 |
3 files changed, 16 insertions, 43 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 33a21caaef9..0e6d823feef 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -6,6 +6,11 @@ * texmf.cnf, * doc/kpathsea.texi: version 6.2.3 for TL17. + * Makefile.am (nodist_kpseinclude_HEADERS): include c-auto.h here. + (kpseinclude_HEADERS): not here. + (nodist_kpselib_HEADERS): and not here; variable no longer needed. + Ken Brown on tldistro, 18 Mar 2017 16:50:41. + 2017-03-14 Karl Berry <karl@tug.org> * Makefile.am (kpseinclude_HEADERS): add c-auto.h. Report from diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index e67f4cce32b..e72ca29407e 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -113,15 +113,11 @@ EXTRA_DIST += \ kpseincludedir = ${includedir}/kpathsea nodist_kpseinclude_HEADERS = \ + c-auto.h \ kpathsea.h \ paths.h -kpseinclude_HEADERS = config.h c-auto.h $(direct_headers) $(indirect_headers) - -kpselibdir = ${libdir}/kpathsea - -nodist_kpselib_HEADERS = \ - c-auto.h +kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers) # Headers included directly into kpathsea.h # @@ -328,4 +324,3 @@ include $(srcdir)/../../am/rebuild.am ## Not used ## EXTRA_DIST += mktex.cnf - diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 7802aa59a0f..a9d6023332b 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)$(kpselibdir)" + "$(DESTDIR)$(kpseincludedir)" 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) \ - $(nodist_kpselib_HEADERS) $(noinst_HEADERS) + $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -717,14 +717,11 @@ 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 -kpseinclude_HEADERS = config.h c-auto.h $(direct_headers) $(indirect_headers) -kpselibdir = ${libdir}/kpathsea -nodist_kpselib_HEADERS = \ - c-auto.h - +kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers) # Headers included directly into kpathsea.h # @@ -1622,27 +1619,6 @@ 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_kpselibHEADERS: $(nodist_kpselib_HEADERS) - @$(NORMAL_INSTALL) - @list='$(nodist_kpselib_HEADERS)'; test -n "$(kpselibdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(kpselibdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(kpselibdir)" || 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)$(kpselibdir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(kpselibdir)" || exit $$?; \ - done - -uninstall-nodist_kpselibHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(nodist_kpselib_HEADERS)'; test -n "$(kpselibdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(kpselibdir)'; $(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. @@ -2104,7 +2080,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)" "$(DESTDIR)$(kpselibdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -2170,8 +2146,7 @@ info-am: install-data-am: install-data-local install-dist_web2cDATA \ install-dist_web2cSCRIPTS install-kpseincludeHEADERS \ - install-nodist_kpseincludeHEADERS \ - install-nodist_kpselibHEADERS install-pkgconfigDATA + install-nodist_kpseincludeHEADERS install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -2224,8 +2199,7 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \ uninstall-dist_web2cSCRIPTS uninstall-kpseincludeHEADERS \ uninstall-libLTLIBRARIES uninstall-local \ - uninstall-nodist_kpseincludeHEADERS \ - uninstall-nodist_kpselibHEADERS uninstall-pkgconfigDATA + uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(am__recursive_targets) all check check-am install install-am \ @@ -2246,8 +2220,7 @@ 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-nodist_kpselibHEADERS install-pdf install-pdf-am \ + 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 \ @@ -2257,7 +2230,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \ uninstall-dist_web2cSCRIPTS uninstall-hook \ uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \ uninstall-local uninstall-nodist_kpseincludeHEADERS \ - uninstall-nodist_kpselibHEADERS uninstall-pkgconfigDATA + uninstall-pkgconfigDATA .PRECIOUS: Makefile |