diff options
-rw-r--r-- | Build/source/texk/m4/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/m4/kpse_inc.m4 | 4 | ||||
-rwxr-xr-x | Build/source/texk/xdvik/configure | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Build/source/texk/m4/ChangeLog b/Build/source/texk/m4/ChangeLog index b1ea32d74f7..7be05827357 100644 --- a/Build/source/texk/m4/ChangeLog +++ b/Build/source/texk/m4/ChangeLog @@ -1,3 +1,9 @@ +2008-07-14 Karl Berry <karl@tug.org> + + * kpse_inc.m4 (kpse_substs): double quote to avoid ^ being + interpreted as a pipe on i386-solaris 10. Bug report from + A. Syropoulos. + 2008-02-07 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse_mtim.m4 (KPSE_STRUCT_ST_MTIM): removed, use instead diff --git a/Build/source/texk/m4/kpse_inc.m4 b/Build/source/texk/m4/kpse_inc.m4 index cb134dd9f7f..43e578e723a 100644 --- a/Build/source/texk/m4/kpse_inc.m4 +++ b/Build/source/texk/m4/kpse_inc.m4 @@ -106,6 +106,8 @@ done kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \ -e 's/kpse_include /kpse_include[[ ]]*/g'` dnl The parens around the eval prevent an "illegal io" in Ultrix sh. -(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > $1 +dnl The double quotes prevent the ^ from being interpreted as a pipe +dnl symbol on i386-solaris (Solaris 10). +(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > $1 ]) diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 622ed7d4ace..4caa2abe076 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -13903,7 +13903,7 @@ done # ... and fix the whitespace and escaped slashes. kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \ -e 's/kpse_include /kpse_include[ ]*/g'` -(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > Makefile.aux +(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > Makefile.aux ;; "gui/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's kpse_input=`case gui/Makefile.in in @@ -13973,7 +13973,7 @@ done # ... and fix the whitespace and escaped slashes. kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \ -e 's/kpse_include /kpse_include[ ]*/g'` -(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > gui/Makefile.aux +(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > gui/Makefile.aux ;; "tests/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's kpse_input=`case tests/Makefile.in in @@ -14043,7 +14043,7 @@ done # ... and fix the whitespace and escaped slashes. kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \ -e 's/kpse_include /kpse_include[ ]*/g'` -(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > tests/Makefile.aux +(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > tests/Makefile.aux ;; esac |