summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-12-24 17:41:08 +0000
committerKarl Berry <karl@freefriends.org>2010-12-24 17:41:08 +0000
commit0aad51642cee2274efe233768de3d2ceb11131af (patch)
treef83bf7e728d55d0c502f518dd2aba43c44ec5572 /Build
parentb3b61b092bd0a6f544929108803875d22397e57a (diff)
(stamp-paths): check for broken grep before generating paths.h.
git-svn-id: svn://tug.org/texlive/trunk@20849 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/Makefile.am4
-rw-r--r--Build/source/texk/kpathsea/Makefile.in4
3 files changed, 14 insertions, 0 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index e445a867da1..e40c3aaa622 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-24 Karl Berry <karl@tug.org>
+
+ * Makefile.am (stamp-paths): ensure that grep is not completely
+ broken, e.g., from GREP_OPTIONS, in which case we'd generate a
+ useless paths.h.
+
2010-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am [WIN32]: Skip mktex{lsr,mf,pk,tfm} shell scripts
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index c89cb80fbfd..29050d33e5a 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -191,6 +191,10 @@ kpseinclude_HEADERS = \
##
paths.h: stamp-paths
stamp-paths: texmf.cnf bsnl.awk
+# ensure grep is not completely broken, e.g., from GREP_OPTIONS.
+ echo a | grep -v b >/dev/null || { echo "*** grep broken, goodbye."; exit 1; }
+#
+# generate paths.h without build machine directories.
echo "/* paths.h: Generated from texmf.cnf. */" >paths.tmp
awk -f $(srcdir)/bsnl.awk $(srcdir)/texmf.cnf \
| sed -e 's/%.*//' -e 's/^[ ]*//' -e 's/[ ]*$$//' \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index bd1a781678d..797b44e985b 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -1752,6 +1752,10 @@ $(libkpathsea_la_OBJECTS): paths.h kpathsea.h
paths.h: stamp-paths
stamp-paths: texmf.cnf bsnl.awk
+# ensure grep is not completely broken, e.g., from GREP_OPTIONS.
+ echo a | grep -v b >/dev/null || { echo "*** grep broken, goodbye."; exit 1; }
+#
+# generate paths.h without build machine directories.
echo "/* paths.h: Generated from texmf.cnf. */" >paths.tmp
awk -f $(srcdir)/bsnl.awk $(srcdir)/texmf.cnf \
| sed -e 's/%.*//' -e 's/^[ ]*//' -e 's/[ ]*$$//' \