diff options
37 files changed, 297 insertions, 627 deletions
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure index d602209aadf..32fc94f7812 100755 --- a/Build/source/libs/gd/configure +++ b/Build/source/libs/gd/configure @@ -11805,15 +11805,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: @@ -11926,15 +11921,10 @@ elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then as_fn_error $? "did not find libpng" "$LINENO" 5 fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - LIBPNG_RULE='# Rebuild libpng + LIBPNG_INCLUDES="-I$kpse_BLD/libs/libpng/include" + LIBPNG_LIBS="$kpse_BLD/libs/libpng/libpng.a" + LIBPNG_DEPEND='${top_builddir}/../../libs/libpng/libpng.a' + LIBPNG_RULE='# Rebuild libpng $(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/libpng/include/png.h: @@ -13435,16 +13425,12 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else - FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2" + FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" - FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - FREETYPE2_RULE='# Rebuild libfreetype + FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' + FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/freetype2/ft2build.h: diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure index f0148138f15..028f2ef3eb6 100755 --- a/Build/source/libs/libpng/configure +++ b/Build/source/libs/libpng/configure @@ -4696,15 +4696,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure index de0a45fc3aa..4a4a243d586 100755 --- a/Build/source/libs/poppler/configure +++ b/Build/source/libs/poppler/configure @@ -5256,15 +5256,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure index 25f064f3712..f8764f44861 100755 --- a/Build/source/libs/teckit/configure +++ b/Build/source/libs/teckit/configure @@ -5647,15 +5647,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure index 4befd4b648d..34b1b992cb0 100755 --- a/Build/source/libs/zziplib/configure +++ b/Build/source/libs/zziplib/configure @@ -5704,15 +5704,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 1d00a960459..61367849e6b 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,12 @@ +2012-04-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-common.m4 (_KPSE_LIB_FLAGS_TL): Replace sed substitutions + in configure by m4_bpatsubst() at autoconf time. + +2012-04-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-obsdcompat-flags.m4: Correct SRC/BLD dependencies. + 2012-03-11 Karl Berry <karl@tug.org> * kpse-xpdf-flags.m4 (KPSE_XPDF_OPTIONS): tweak help text slightly. diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4 index c3819e31d18..4d472482950 100644 --- a/Build/source/m4/kpse-common.m4 +++ b/Build/source/m4/kpse-common.m4 @@ -1,13 +1,11 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 1995 - 2009 Karl Berry <tex-live@tug.org> -# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 1995-2009 Karl Berry <tex-live@tug.org> +# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 0 - # KPSE_LIBS_PREPARE # ----------------- # Enforce inclusion of this file. @@ -64,6 +62,8 @@ AC_LANG(_AC_LANG)[]dnl # # Set the make variables LIBDIR_INCLUDES and LIBDIR_LIBS to the CPPFLAGS and # LIBS required for the library in the directory libs/LIBDIR/ of the TL tree. +# The resulting values may be used by configure tests; thus they must not +# use, e.g., ${srcdir} or ${top_builddir}. # # If an installed (system) version of the library has been selected or is # implied, then execute KPSE_LIBDIR_SYSTEM_FLAGS to set the two variables. @@ -114,29 +114,23 @@ if test "x$with_system_[]AS_TR_SH($1)" = xyes; then ]AS_TR_CPP([kpse-$1-system-flags])[[]dnl else ])[]dnl m4_if - AS_TR_CPP($1)[_INCLUDES=`echo '$4' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"`] - AS_TR_CPP($1)[_LIBS=`echo '$5' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - $6] - m4_ifdef([Kpse_TeX_Lib], - [AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'`] - AS_TR_CPP($1)[_RULE='# Rebuild lib$2 -$(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7], - [[ $7]])m4_ifval([$8], [[ $8 - cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild -$8:]])[ - cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']], - [AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'`] - AS_TR_CPP($1)[_RULE='# Rebuild lib$2 + AS_TR_CPP($1)[_INCLUDES=]m4_bpatsubst(m4_bpatsubst(["$4"], [SRC], [$kpse_SRC]), + [BLD], [$kpse_BLD]) + AS_TR_CPP($1)[_LIBS=]m4_bpatsubst(["$5"], [BLD], [$kpse_BLD])m4_ifval([$6], [[ + $6]]) + AS_TR_CPP($1)[_DEPEND=]m4_ifdef([Kpse_TeX_Lib], + [m4_bpatsubst(['$5'], [BLD/texk], + [${top_builddir}/..])m4_pushdef([Kpse_Lib_Bld], + [..])], + [m4_bpatsubst(['$5'], [BLD], + [${top_builddir}/../..])m4_pushdef([Kpse_Lib_Bld], + [../../libs])]) + AS_TR_CPP($1)[_RULE='# Rebuild lib$2 $(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7], [[ $7]])m4_ifval([$8], [[ $8 - cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild + cd ${top_builddir}/]Kpse_Lib_Bld[/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild $8:]])[ - cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']]) + cd ${top_builddir}/]Kpse_Lib_Bld[/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']m4_popdef([Kpse_Lib_Bld]) m4_if(m4_index([ $3 ], [ tree ]), [-1], [fi ])[]dnl m4_if diff --git a/Build/source/m4/kpse-obsdcompat-flags.m4 b/Build/source/m4/kpse-obsdcompat-flags.m4 index 0a093b0be6b..16f6bc94bbd 100644 --- a/Build/source/m4/kpse-obsdcompat-flags.m4 +++ b/Build/source/m4/kpse-obsdcompat-flags.m4 @@ -1,12 +1,10 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 0 - # KPSE_OBSDCOMPAT_FLAGS # --------------------- # Set the make variables OBSDCOMPAT_INCLUDES and OBSDCOMPAT_LIBS to @@ -16,5 +14,5 @@ AC_DEFUN([KPSE_OBSDCOMPAT_FLAGS], [_KPSE_LIB_FLAGS([obsdcompat], [openbsd-compat], [tree], [-IBLD/libs/obsdcompat -ISRC/libs/obsdcompat], [BLD/libs/obsdcompat/libopenbsd-compat.a], [], - [], [${top_srcdir}/../../libs/obsdcompat/*.[ch]])[]dnl + [${top_srcdir}/../../libs/obsdcompat/*.[ch]])[]dnl ]) # KPSE_OBSDCOMPAT_FLAGS diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure index 7e8f4902053..b186f229f87 100755 --- a/Build/source/texk/afm2pl/configure +++ b/Build/source/texk/afm2pl/configure @@ -14048,15 +14048,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure index 080b158153f..c8f50d5da34 100755 --- a/Build/source/texk/bibtex8/configure +++ b/Build/source/texk/bibtex8/configure @@ -13982,15 +13982,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/bibtexu/configure b/Build/source/texk/bibtexu/configure index d81fb5e3f7c..0ebd7ce49b3 100755 --- a/Build/source/texk/bibtexu/configure +++ b/Build/source/texk/bibtexu/configure @@ -18281,15 +18281,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -18440,15 +18435,10 @@ elif test "x$need_icu:$with_system_icu" = xyes:yes; then as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5 fi else - ICU_INCLUDES=`echo '-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libicuio.a BLD/libs/icu/icu-build/lib/libicui18n.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libicuio.a BLD/libs/icu/icu-build/lib/libicui18n.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ICU_RULE='# Rebuild libicuxxx + ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include" + ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicuio.a $kpse_BLD/libs/icu/icu-build/lib/libicui18n.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a" + ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicuio.a ${top_builddir}/../../libs/icu/icu-build/lib/libicui18n.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a' + ICU_RULE='# Rebuild libicuxxx $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/icu/include/unicode/uversion.h: diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure index 57360889a7a..5f8e78ba87f 100755 --- a/Build/source/texk/cjkutils/configure +++ b/Build/source/texk/cjkutils/configure @@ -14068,15 +14068,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure index c2cddf50873..5ae5d78a4e1 100755 --- a/Build/source/texk/detex/configure +++ b/Build/source/texk/detex/configure @@ -14189,15 +14189,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure index 3ef418db7ec..f8be2da75be 100755 --- a/Build/source/texk/dtl/configure +++ b/Build/source/texk/dtl/configure @@ -14236,15 +14236,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure index 9f0dabc4b9c..191d612463b 100755 --- a/Build/source/texk/dvi2tty/configure +++ b/Build/source/texk/dvi2tty/configure @@ -14004,15 +14004,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -14080,15 +14075,10 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - PTEXENC_RULE='# Rebuild libptexenc + PTEXENC_INCLUDES="-I$kpse_BLD/texk/ptexenc -I$kpse_SRC/texk/ptexenc" + PTEXENC_LIBS="$kpse_BLD/texk/ptexenc/libptexenc.la" + PTEXENC_DEPEND='${top_builddir}/../ptexenc/libptexenc.la' + PTEXENC_RULE='# Rebuild libptexenc $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure index db5352ada46..f9e59f9eeb0 100755 --- a/Build/source/texk/dvidvi/configure +++ b/Build/source/texk/dvidvi/configure @@ -13992,15 +13992,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure index ae3a924d96c..7dbb5916191 100755 --- a/Build/source/texk/dviljk/configure +++ b/Build/source/texk/dviljk/configure @@ -14240,15 +14240,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index 6b677d41e37..c69ce423ef9 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -15039,15 +15039,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -15115,15 +15110,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: @@ -15236,15 +15226,10 @@ elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then as_fn_error $? "did not find libpng" "$LINENO" 5 fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - LIBPNG_RULE='# Rebuild libpng + LIBPNG_INCLUDES="-I$kpse_BLD/libs/libpng/include" + LIBPNG_LIBS="$kpse_BLD/libs/libpng/libpng.a" + LIBPNG_DEPEND='${top_builddir}/../../libs/libpng/libpng.a' + LIBPNG_RULE='# Rebuild libpng $(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/libpng/include/png.h: diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index c92405ed054..17616adb720 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -15833,15 +15833,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -15909,15 +15904,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: @@ -16030,15 +16020,10 @@ elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then as_fn_error $? "did not find libpng" "$LINENO" 5 fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - LIBPNG_RULE='# Rebuild libpng + LIBPNG_INCLUDES="-I$kpse_BLD/libs/libpng/include" + LIBPNG_LIBS="$kpse_BLD/libs/libpng/libpng.a" + LIBPNG_DEPEND='${top_builddir}/../../libs/libpng/libpng.a' + LIBPNG_RULE='# Rebuild libpng $(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/libpng/include/png.h: @@ -16070,15 +16055,10 @@ if test "x$with_t1lib_libdir" != x && test "x$with_t1lib_libdir" != xyes; then T1LIB_LIBS="-L$with_t1lib_libdir $T1LIB_LIBS" fi else - T1LIB_INCLUDES=`echo '-IBLD/libs/t1lib' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - T1LIB_LIBS=`echo 'BLD/libs/t1lib/libt1.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - T1LIB_DEPEND=`echo 'BLD/libs/t1lib/libt1.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - T1LIB_RULE='# Rebuild libt1 + T1LIB_INCLUDES="-I$kpse_BLD/libs/t1lib" + T1LIB_LIBS="$kpse_BLD/libs/t1lib/libt1.a" + T1LIB_DEPEND='${top_builddir}/../../libs/t1lib/libt1.a' + T1LIB_RULE='# Rebuild libt1 $(T1LIB_DEPEND): ${top_builddir}/../../libs/t1lib/t1lib.h cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/t1lib/t1lib.h: @@ -16191,16 +16171,12 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else - FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2" + FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" - FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - FREETYPE2_RULE='# Rebuild libfreetype + FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' + FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/freetype2/ft2build.h: @@ -16232,15 +16208,10 @@ if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then GD_LIBS="-L$with_gd_libdir $GD_LIBS" fi else - GD_INCLUDES=`echo '-IBLD/libs/gd/include -DNONDLL' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - GD_LIBS=`echo 'BLD/libs/gd/libgd.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - GD_DEPEND=`echo 'BLD/libs/gd/libgd.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - GD_RULE='# Rebuild libgd + GD_INCLUDES="-I$kpse_BLD/libs/gd/include -DNONDLL" + GD_LIBS="$kpse_BLD/libs/gd/libgd.a" + GD_DEPEND='${top_builddir}/../../libs/gd/libgd.a' + GD_RULE='# Rebuild libgd $(GD_DEPEND): ${top_builddir}/../../libs/gd/include/gd.h cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/gd/include/gd.h: diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure index 4287cfe227f..63919e30240 100755 --- a/Build/source/texk/dvipos/configure +++ b/Build/source/texk/dvipos/configure @@ -14048,15 +14048,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure index 0679c3c2dab..e078015aeb2 100755 --- a/Build/source/texk/dvipsk/configure +++ b/Build/source/texk/dvipsk/configure @@ -14266,15 +14266,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index d5bcba02051..41a0788b7aa 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -18558,15 +18558,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -18634,15 +18629,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: @@ -18755,16 +18745,12 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else - FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2" + FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" - FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - FREETYPE2_RULE='# Rebuild libfreetype + FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' + FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/freetype2/ft2build.h: diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure index 15c3b338812..0351e214b04 100755 --- a/Build/source/texk/gsftopk/configure +++ b/Build/source/texk/gsftopk/configure @@ -14367,15 +14367,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index c65577f92b9..df73118fe79 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -19074,15 +19074,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index 00334b8fe47..41335a66834 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -14015,15 +14015,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/makejvf/configure b/Build/source/texk/makejvf/configure index 3ce0b85b9e9..3b5259f93d8 100755 --- a/Build/source/texk/makejvf/configure +++ b/Build/source/texk/makejvf/configure @@ -14012,15 +14012,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -14088,15 +14083,10 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - PTEXENC_RULE='# Rebuild libptexenc + PTEXENC_INCLUDES="-I$kpse_BLD/texk/ptexenc -I$kpse_SRC/texk/ptexenc" + PTEXENC_LIBS="$kpse_BLD/texk/ptexenc/libptexenc.la" + PTEXENC_DEPEND='${top_builddir}/../ptexenc/libptexenc.la' + PTEXENC_RULE='# Rebuild libptexenc $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index bcb74e3f965..18ff1912c20 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -13987,15 +13987,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -14063,15 +14058,10 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - PTEXENC_RULE='# Rebuild libptexenc + PTEXENC_INCLUDES="-I$kpse_BLD/texk/ptexenc -I$kpse_SRC/texk/ptexenc" + PTEXENC_LIBS="$kpse_BLD/texk/ptexenc/libptexenc.la" + PTEXENC_DEPEND='${top_builddir}/../ptexenc/libptexenc.la' + PTEXENC_RULE='# Rebuild libptexenc $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pkm/configure index ca55df9207e..f24428352d9 100755 --- a/Build/source/texk/ps2pkm/configure +++ b/Build/source/texk/ps2pkm/configure @@ -14195,15 +14195,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure index e33ad0992d2..26c560da557 100755 --- a/Build/source/texk/ptexenc/configure +++ b/Build/source/texk/ptexenc/configure @@ -13999,15 +13999,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure index 3fc68cff59f..dfe42c1c756 100755 --- a/Build/source/texk/seetexk/configure +++ b/Build/source/texk/seetexk/configure @@ -14227,15 +14227,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index d1257b90942..e72cfc7e766 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -14207,15 +14207,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure index 7b73618a02a..c53df4eb261 100755 --- a/Build/source/texk/ttf2pk/configure +++ b/Build/source/texk/ttf2pk/configure @@ -14060,15 +14060,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -14136,15 +14131,10 @@ if test "x$with_freetype_libdir" != x && test "x$with_freetype_libdir" != xyes; FREETYPE_LIBS="-L$with_freetype_libdir $FREETYPE_LIBS" fi else - FREETYPE_INCLUDES=`echo '-IBLD/libs/freetype/freetype' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - FREETYPE_LIBS=`echo 'BLD/libs/freetype/libttf.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - FREETYPE_DEPEND=`echo 'BLD/libs/freetype/libttf.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - FREETYPE_RULE='# Rebuild libttf + FREETYPE_INCLUDES="-I$kpse_BLD/libs/freetype/freetype" + FREETYPE_LIBS="$kpse_BLD/libs/freetype/libttf.a" + FREETYPE_DEPEND='${top_builddir}/../../libs/freetype/libttf.a' + FREETYPE_RULE='# Rebuild libttf $(FREETYPE_DEPEND): ${top_builddir}/../../libs/freetype/freetype/freetype.h cd ${top_builddir}/../../libs/freetype && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/freetype/freetype/freetype.h: diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure index c49f81cbd9a..2da51aade5b 100755 --- a/Build/source/texk/ttf2pk2/configure +++ b/Build/source/texk/ttf2pk2/configure @@ -14067,15 +14067,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -14143,15 +14138,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: @@ -14264,16 +14254,12 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else - FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2" + FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" - FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - FREETYPE2_RULE='# Rebuild libfreetype + FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' + FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/freetype2/ft2build.h: diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 05b7122d1ce..4c3e898a94b 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -22184,15 +22184,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -22260,15 +22255,10 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - PTEXENC_RULE='# Rebuild libptexenc + PTEXENC_INCLUDES="-I$kpse_BLD/texk/ptexenc -I$kpse_SRC/texk/ptexenc" + PTEXENC_LIBS="$kpse_BLD/texk/ptexenc/libptexenc.la" + PTEXENC_DEPEND='${top_builddir}/../ptexenc/libptexenc.la' + PTEXENC_RULE='# Rebuild libptexenc $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi @@ -22298,15 +22288,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: @@ -22327,15 +22312,10 @@ elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then as_fn_error $? "did not find libpng" "$LINENO" 5 fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - LIBPNG_RULE='# Rebuild libpng + LIBPNG_INCLUDES="-I$kpse_BLD/libs/libpng/include" + LIBPNG_LIBS="$kpse_BLD/libs/libpng/libpng.a" + LIBPNG_DEPEND='${top_builddir}/../../libs/libpng/libpng.a' + LIBPNG_RULE='# Rebuild libpng $(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/libpng/include/png.h: @@ -22357,15 +22337,10 @@ elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 fi else - XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - XPDF_LIBS=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - XPDF_DEPEND=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - XPDF_RULE='# Rebuild libxpdf + XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf" + XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a" + XPDF_DEPEND='${top_builddir}/../../libs/xpdf/libxpdf.a' + XPDF_RULE='# Rebuild libxpdf $(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/xpdf/xpdf/Stream.h: @@ -22387,15 +22362,10 @@ elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 fi else - POPPLER_INCLUDES=`echo '-IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - POPPLER_LIBS=`echo 'BLD/libs/poppler/libpoppler.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - POPPLER_DEPEND=`echo 'BLD/libs/poppler/libpoppler.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - POPPLER_RULE='# Rebuild libpoppler + POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler -I$kpse_BLD/libs/poppler/goo -I$kpse_BLD/libs/poppler/poppler" + POPPLER_LIBS="$kpse_BLD/libs/poppler/libpoppler.a" + POPPLER_DEPEND='${top_builddir}/../../libs/poppler/libpoppler.a' + POPPLER_RULE='# Rebuild libpoppler $(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/poppler/Stream.h cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/poppler/poppler/Stream.h: @@ -22417,15 +22387,10 @@ elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then as_fn_error $? "did not find zziplib-0.12 or better" "$LINENO" 5 fi else - ZZIPLIB_INCLUDES=`echo '-IBLD/libs/zziplib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZZIPLIB_LIBS=`echo 'BLD/libs/zziplib/libzzip.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZZIPLIB_DEPEND=`echo 'BLD/libs/zziplib/libzzip.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZZIPLIB_RULE='# Rebuild libzzip + ZZIPLIB_INCLUDES="-I$kpse_BLD/libs/zziplib/include" + ZZIPLIB_LIBS="$kpse_BLD/libs/zziplib/libzzip.a" + ZZIPLIB_DEPEND='${top_builddir}/../../libs/zziplib/libzzip.a' + ZZIPLIB_RULE='# Rebuild libzzip $(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h: @@ -22446,15 +22411,10 @@ elif test "x$need_graphite:$with_system_graphite" = xyes:yes; then as_fn_error $? "did not find silgraphite 2.3 or better" "$LINENO" 5 fi else - GRAPHITE_INCLUDES=`echo '-IBLD/libs/graphite/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - GRAPHITE_LIBS=`echo 'BLD/libs/graphite/libgraphite.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - GRAPHITE_DEPEND=`echo 'BLD/libs/graphite/libgraphite.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - GRAPHITE_RULE='# Rebuild libgraphite + GRAPHITE_INCLUDES="-I$kpse_BLD/libs/graphite/include" + GRAPHITE_LIBS="$kpse_BLD/libs/graphite/libgraphite.a" + GRAPHITE_DEPEND='${top_builddir}/../../libs/graphite/libgraphite.a' + GRAPHITE_RULE='# Rebuild libgraphite $(GRAPHITE_DEPEND): ${top_builddir}/../../libs/graphite/include/graphite/GrClient.h cd ${top_builddir}/../../libs/graphite && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/graphite/include/graphite/GrClient.h: @@ -22567,16 +22527,12 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else - FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2" + FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" - FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - FREETYPE2_RULE='# Rebuild libfreetype + FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' + FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/freetype2/ft2build.h: @@ -22608,15 +22564,10 @@ if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS" fi else - TECKIT_INCLUDES=`echo '-IBLD/libs/teckit/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - TECKIT_LIBS=`echo 'BLD/libs/teckit/libTECkit.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - TECKIT_DEPEND=`echo 'BLD/libs/teckit/libTECkit.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - TECKIT_RULE='# Rebuild libTECkit + TECKIT_INCLUDES="-I$kpse_BLD/libs/teckit/include" + TECKIT_LIBS="$kpse_BLD/libs/teckit/libTECkit.a" + TECKIT_DEPEND='${top_builddir}/../../libs/teckit/libTECkit.a' + TECKIT_RULE='# Rebuild libTECkit $(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h: @@ -22624,33 +22575,21 @@ ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h: fi ## _KPSE_LIB_FLAGS: Setup icu (-lsicuxxx) flags - ICU_INCLUDES=`echo '-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libicule.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libicule.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ICU_RULE='# Rebuild libsicuxxx + ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include" + ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicule.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a" + ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicule.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a' + ICU_RULE='# Rebuild libsicuxxx $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/icu/include/unicode/uversion.h: cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' ## _KPSE_LIB_FLAGS: Setup obsdcompat (-lopenbsd-compat) flags - OBSDCOMPAT_INCLUDES=`echo '-IBLD/libs/obsdcompat -ISRC/libs/obsdcompat' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - OBSDCOMPAT_LIBS=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - OBSDCOMPAT_DEPEND=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat + OBSDCOMPAT_INCLUDES="-I$kpse_BLD/libs/obsdcompat -I$kpse_SRC/libs/obsdcompat" + OBSDCOMPAT_LIBS="$kpse_BLD/libs/obsdcompat/libopenbsd-compat.a" + OBSDCOMPAT_DEPEND='${top_builddir}/../../libs/obsdcompat/libopenbsd-compat.a' + OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat $(OBSDCOMPAT_DEPEND): ${top_srcdir}/../../libs/obsdcompat/*.[ch] - cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_srcdir}/../../libs/obsdcompat/*.[ch]: cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS) rebuild' diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure index 1bb3563997f..788ca6bcb4c 100755 --- a/Build/source/texk/xdv2pdf/configure +++ b/Build/source/texk/xdv2pdf/configure @@ -18498,15 +18498,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index bd79b1b0c18..04b51fcbece 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -17784,15 +17784,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -17860,15 +17855,10 @@ if test "x$with_t1lib_libdir" != x && test "x$with_t1lib_libdir" != xyes; then T1LIB_LIBS="-L$with_t1lib_libdir $T1LIB_LIBS" fi else - T1LIB_INCLUDES=`echo '-IBLD/libs/t1lib' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - T1LIB_LIBS=`echo 'BLD/libs/t1lib/libt1.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - T1LIB_DEPEND=`echo 'BLD/libs/t1lib/libt1.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - T1LIB_RULE='# Rebuild libt1 + T1LIB_INCLUDES="-I$kpse_BLD/libs/t1lib" + T1LIB_LIBS="$kpse_BLD/libs/t1lib/libt1.a" + T1LIB_DEPEND='${top_builddir}/../../libs/t1lib/libt1.a' + T1LIB_RULE='# Rebuild libt1 $(T1LIB_DEPEND): ${top_builddir}/../../libs/t1lib/t1lib.h cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/t1lib/t1lib.h: diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index ecbb16a6c32..526a52d8434 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -15080,15 +15080,10 @@ if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" fi else - KPATHSEA_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ - -e 's,BLD/texk/,${top_builddir}/../,g'` - KPATHSEA_RULE='# Rebuild libkpathsea + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea $(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../kpathsea/paths.h: @@ -15156,15 +15151,10 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz + ZLIB_INCLUDES="-I$kpse_BLD/libs/zlib/include" + ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" + ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' + ZLIB_RULE='# Rebuild libz $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/zlib/include/zconf.h: @@ -15277,15 +15267,10 @@ elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then as_fn_error $? "did not find libpng" "$LINENO" 5 fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - - LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - LIBPNG_RULE='# Rebuild libpng + LIBPNG_INCLUDES="-I$kpse_BLD/libs/libpng/include" + LIBPNG_LIBS="$kpse_BLD/libs/libpng/libpng.a" + LIBPNG_DEPEND='${top_builddir}/../../libs/libpng/libpng.a' + LIBPNG_RULE='# Rebuild libpng $(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/libpng/include/png.h: @@ -15398,16 +15383,12 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 fi else - FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_INCLUDES="$kpse_BLD/libs/freetype2" + FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" - FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.la' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - FREETYPE2_RULE='# Rebuild libfreetype + FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' + FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild ${top_builddir}/../../libs/freetype2/ft2build.h: |