summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-09 09:47:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-09 09:47:38 +0000
commitbe2d7d96f620affad0820e13fa4bafa7a96b1596 (patch)
treee414a696867a587b2ee9234eb37331495374b907 /Build/source/texk/kpathsea
parentf7c1e6fdb40e6b00a13f6b619df726d9ac01191f (diff)
build system: Various minor fixes
git-svn-id: svn://tug.org/texlive/trunk@27352 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/Makefile.am30
-rw-r--r--Build/source/texk/kpathsea/Makefile.in82
-rw-r--r--Build/source/texk/kpathsea/win32/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.am6
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.in25
6 files changed, 88 insertions, 63 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 566f3fa58ab..a8a520ae19b 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use ../am/bin_links.am.
+
2012-08-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* win32lib.h: remove definition of pipe.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index f667820aa95..abef1d7646a 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -246,11 +246,7 @@ dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
dist_noinst_DATA = texmf.cnf
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
-bin_links = \
- mktexlsr:texhash
-
-install-exec-hook:
+install-exec-local: installdirs-am
if !WIN32
@for f in $(dist_noinst_SCRIPTS); do \
if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
@@ -259,17 +255,9 @@ if !WIN32
$(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(bindir)/$$f"; \
else :; fi; \
done
- @cd $(DESTDIR)$(bindir) && \
- for s in $(bin_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
- file=`echo $$s | sed 's,:.*,,'`; \
- rm -f $$link; \
- echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link || exit 1; \
- done
endif !WIN32
-install-data-hook:
+install-data-local: installdirs-am
@for f in $(dist_noinst_DATA); do \
if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1 \
|| test ! -r "$(DESTDIR)$(web2cdir)/$$f"; then \
@@ -278,7 +266,7 @@ install-data-hook:
else :; fi; \
done
-uninstall-hook:
+uninstall-local:
if !WIN32
@for f in $(dist_noinst_SCRIPTS); do \
if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
@@ -286,10 +274,6 @@ if !WIN32
rm -f "$(DESTDIR)$(bindir)/$$f"; \
else :; fi; \
done
- @for s in $(bin_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
- rm -f $(DESTDIR)$(bindir)/$$link; \
- done
endif !WIN32
@for f in $(dist_noinst_DATA); do \
if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
@@ -298,6 +282,14 @@ endif !WIN32
else :; fi; \
done
+bin_links = mktexlsr:texhash
+
+include $(top_srcdir)/../am/bin_links.am
+
+install-exec-hook: install-bin-links
+
+uninstall-hook: uninstall-bin-links
+
## The tests
TESTS = kpseaccess.test kpsereadlink.test kpsestat.test kpsewhich.test
TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 1ba63940170..4694a3c2c75 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -73,7 +73,6 @@ host_triplet = @host@
bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \
kpsestat$(EXEEXT) kpsewhich$(EXEEXT)
EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT)
-subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_noinst_DATA) \
$(dist_noinst_SCRIPTS) $(dist_web2c_DATA) \
$(dist_web2c_SCRIPTS) $(kpseinclude_HEADERS) $(noinst_HEADERS) \
@@ -83,12 +82,14 @@ DIST_COMMON = README $(am__configure_deps) $(dist_noinst_DATA) \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/missing $(top_srcdir)/configure \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../am/bin_links.am $(top_srcdir)/configure \
../../build-aux/config.guess ../../build-aux/config.sub \
../../build-aux/depcomp ../../build-aux/install-sh \
../../build-aux/ltmain.sh ../../build-aux/missing \
../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \
ChangeLog NEWS putenv.c strcasecmp.c strstr.c strtol.c
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
@@ -523,11 +524,7 @@ dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
dist_noinst_DATA = texmf.cnf
-
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
-bin_links = \
- mktexlsr:texhash
-
+bin_links = mktexlsr:texhash
TESTS = kpseaccess.test kpsereadlink.test kpsestat.test kpsewhich.test
TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
all: $(BUILT_SOURCES) c-auto.h
@@ -537,7 +534,7 @@ all: $(BUILT_SOURCES) c-auto.h
.SUFFIXES: .c .lo .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -560,6 +557,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/../am/bin_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1796,15 +1794,16 @@ info: info-recursive
info-am:
-install-data-am: install-dist_web2cDATA install-dist_web2cSCRIPTS \
- install-kpseincludeHEADERS install-nodist_kpseincludeHEADERS
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-data-am: install-data-local install-dist_web2cDATA \
+ install-dist_web2cSCRIPTS install-kpseincludeHEADERS \
+ install-nodist_kpseincludeHEADERS
+
install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+install-exec-am: install-binPROGRAMS install-exec-local \
+ install-libLTLIBRARIES
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive
@@ -1849,13 +1848,14 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
uninstall-dist_web2cSCRIPTS uninstall-kpseincludeHEADERS \
- uninstall-libLTLIBRARIES uninstall-nodist_kpseincludeHEADERS
+ uninstall-libLTLIBRARIES uninstall-local \
+ uninstall-nodist_kpseincludeHEADERS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
check-am cscopelist-recursive ctags-recursive install \
- install-am install-data-am install-exec-am install-strip \
- tags-recursive uninstall-am
+ install-am install-exec-am install-strip tags-recursive \
+ uninstall-am
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-TESTS check-am clean \
@@ -1868,11 +1868,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am \
- install-data-hook install-dist_web2cDATA \
+ install-data-local install-dist_web2cDATA \
install-dist_web2cSCRIPTS install-dvi install-dvi-am \
- install-exec install-exec-am install-exec-hook install-html \
- install-html-am install-info install-info-am \
- install-kpseincludeHEADERS install-libLTLIBRARIES install-man \
+ install-exec install-exec-am install-exec-hook \
+ 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-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
@@ -1882,7 +1883,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
uninstall-binPROGRAMS uninstall-dist_web2cDATA \
uninstall-dist_web2cSCRIPTS uninstall-hook \
uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \
- uninstall-nodist_kpseincludeHEADERS
+ uninstall-local uninstall-nodist_kpseincludeHEADERS
# Rebuild
@@ -1920,7 +1921,7 @@ kpathsea.h: Makefile paths.h
echo "#include <kpathsea/$$f>" >>$@; \
done
-install-exec-hook:
+install-exec-local: installdirs-am
@WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \
@WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
@WIN32_FALSE@ || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
@@ -1928,16 +1929,8 @@ install-exec-hook:
@WIN32_FALSE@ $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(bindir)/$$f"; \
@WIN32_FALSE@ else :; fi; \
@WIN32_FALSE@ done
-@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
-@WIN32_FALSE@ for s in $(bin_links); do \
-@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
-@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \
-@WIN32_FALSE@ rm -f $$link; \
-@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
-@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
-@WIN32_FALSE@ done
-install-data-hook:
+install-data-local: installdirs-am
@for f in $(dist_noinst_DATA); do \
if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1 \
|| test ! -r "$(DESTDIR)$(web2cdir)/$$f"; then \
@@ -1946,23 +1939,40 @@ install-data-hook:
else :; fi; \
done
-uninstall-hook:
+uninstall-local:
@WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \
@WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
@WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \
@WIN32_FALSE@ else :; fi; \
@WIN32_FALSE@ done
-@WIN32_FALSE@ @for s in $(bin_links); do \
-@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
-@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
-@WIN32_FALSE@ done
@for f in $(dist_noinst_DATA); do \
if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
else :; fi; \
done
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@ for s in $(bin_links); do \
+@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@ rm -f $$link; \
+@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@ done
+
+uninstall-bin-links:
+@WIN32_FALSE@ @for s in $(bin_links); do \
+@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@ done
+
+install-exec-hook: install-bin-links
+
+uninstall-hook: uninstall-bin-links
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog
index 9905eb0b95a..feac8b70271 100644
--- a/Build/source/texk/kpathsea/win32/ChangeLog
+++ b/Build/source/texk/kpathsea/win32/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Install texhash.exe as copy of mktexlsr.exe.
+
2012-08-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* mktexfmt.c, mktexpk.c, mktextfm.c: Replace P_WAIT by _P_WAIT.
diff --git a/Build/source/texk/kpathsea/win32/Makefile.am b/Build/source/texk/kpathsea/win32/Makefile.am
index 1e0614ac519..ddc8763fe19 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.am
+++ b/Build/source/texk/kpathsea/win32/Makefile.am
@@ -66,6 +66,12 @@ mktexupd_SOURCES = \
LDADD = ../libkpathsea.la
+install-exec-hook:
+ cp -p $(DESTDIR)$(bindir)/mktexlsr$(EXEEXT) $(DESTDIR)$(bindir)/texhash$(EXEEXT)
+
+uninstall-hook:
+ rm -f $(DESTDIR)$(bindir)/texhash$(EXEEXT)
+
## Rebuild libkpathsea
../libkpathsea.la: ${top_srcdir}/../kpathsea/*.[ch] ../paths.h
cd .. && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/kpathsea/win32/Makefile.in b/Build/source/texk/kpathsea/win32/Makefile.in
index fe287be753e..c58a778eb5e 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.in
+++ b/Build/source/texk/kpathsea/win32/Makefile.in
@@ -616,7 +616,8 @@ install-dvi: install-dvi-am
install-dvi-am:
install-exec-am: install-binPROGRAMS
-
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-am
install-html-am:
@@ -656,8 +657,9 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-exec-am install-strip uninstall-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool cscopelist ctags distclean \
@@ -665,14 +667,21 @@ uninstall-am: uninstall-binPROGRAMS
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-exec-am install-exec-hook install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-hook
+
+
+install-exec-hook:
+ cp -p $(DESTDIR)$(bindir)/mktexlsr$(EXEEXT) $(DESTDIR)$(bindir)/texhash$(EXEEXT)
+uninstall-hook:
+ rm -f $(DESTDIR)$(bindir)/texhash$(EXEEXT)
../libkpathsea.la: ${top_srcdir}/../kpathsea/*.[ch] ../paths.h
cd .. && $(MAKE) $(AM_MAKEFLAGS) rebuild