summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-19 14:04:33 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-19 14:04:33 +0000
commit4dde292c4237013057d636885d500362dc92f562 (patch)
treefd5d01c97a362b003f8105d65f95b517ab1b70eb /Build/source/texk/kpathsea
parent738536ef96851d77d46bd1e8096a243421d9959e (diff)
WIN32: do not install shell scripts
git-svn-id: svn://tug.org/texlive/trunk@20804 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/Makefile.am11
-rw-r--r--Build/source/texk/kpathsea/Makefile.in54
3 files changed, 37 insertions, 33 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 1edf310abee..e445a867da1 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am [WIN32]: Skip mktex{lsr,mf,pk,tfm} shell scripts
+ and texhash->mktexlsr symlink.
+
2010-12-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* tex-make.c (maketex): Factor out common WIN32 & Unix code.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index 30995774403..c89cb80fbfd 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -263,6 +263,7 @@ bin_links = \
mktexlsr:texhash
install-exec-hook:
+if !WIN32
@for f in $(dist_noinst_SCRIPTS); do \
if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
|| test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
@@ -278,7 +279,7 @@ install-exec-hook:
echo "creating link '$$link' -> '$$file'"; \
$(LN_S) $$file $$link; \
done
-
+endif !WIN32
install-data-hook:
@for f in $(dist_noinst_DATA); do \
@@ -290,9 +291,9 @@ install-data-hook:
done
uninstall-hook:
+if !WIN32
@for f in $(dist_noinst_SCRIPTS); do \
- if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
- || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
+ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$f"; \
else :; fi; \
@@ -301,9 +302,9 @@ uninstall-hook:
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 \
- || test ! -r "$(DESTDIR)$(web2cdir)/$$f"; then \
+ 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; \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 75a87f8b43b..bd1a781678d 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -1796,21 +1796,21 @@ kpathsea.h: Makefile paths.h
-e 's,^,#include <kpathsea/,' -e s',$$,>,' >>$@
install-exec-hook:
- @for f in $(dist_noinst_SCRIPTS); do \
- if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
- || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
- echo " $(INSTALL_SCRIPT) '$(srcdir)/$$f' '$(DESTDIR)$(bindir)/$$f'"; \
- $(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; \
- done
+@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 \
+@WIN32_FALSE@ echo " $(INSTALL_SCRIPT) '$(srcdir)/$$f' '$(DESTDIR)$(bindir)/$$f'"; \
+@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; \
+@WIN32_FALSE@ done
install-data-hook:
@for f in $(dist_noinst_DATA); do \
@@ -1822,20 +1822,18 @@ install-data-hook:
done
uninstall-hook:
- @for f in $(dist_noinst_SCRIPTS); do \
- if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
- || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- 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
+@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 \
- || test ! -r "$(DESTDIR)$(web2cdir)/$$f"; then \
+ 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; \