summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-24 08:56:10 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-24 08:56:10 +0000
commit8c9e19999acc6964e0ea1689190296b3b61cf7df (patch)
treef2b29c9296a71f2fd45183d8f263df0b336b54ea /Build/source/texk/xdvik/configure
parentea36cf4d769e5c6188d49363c8db5a85a7aee35b (diff)
build system: Replace sed substitutions in configure by m4_bpatsubst() at autoconf time
git-svn-id: svn://tug.org/texlive/trunk@26120 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik/configure')
-rwxr-xr-xBuild/source/texk/xdvik/configure26
1 files changed, 8 insertions, 18 deletions
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: