summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea/Makefile.am
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/Makefile.am
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/Makefile.am')
-rw-r--r--Build/source/texk/kpathsea/Makefile.am30
1 files changed, 11 insertions, 19 deletions
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)'