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