summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx/configure
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvipdfmx/configure')
-rwxr-xr-xBuild/source/texk/dvipdfmx/configure39
1 files changed, 12 insertions, 27 deletions
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: