summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-20 09:15:29 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-20 09:15:29 +0000
commitac005f402389542b123fd41fd9fc54322f3becf1 (patch)
tree6234c1b385dd10b6716c676108ecf68856ea7480 /Build/source/texk/dvipng
parent9301a1dd22ac8cedf4f7f980c96ef9e4f2bd37c2 (diff)
somewhat reorganize libs build system
git-svn-id: svn://tug.org/texlive/trunk@16091 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng')
-rwxr-xr-xBuild/source/texk/dvipng/configure12
1 files changed, 6 insertions, 6 deletions
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 014493a98ad..a0b08f94424 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -14688,7 +14688,7 @@ 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' | sed \
+ 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 \
@@ -14697,9 +14697,9 @@ else
ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ZLIB_RULE='# Rebuild libz
-$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h
+$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h
cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h:
+${top_builddir}/../../libs/zlib/include/zconf.h:
cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
@@ -14728,7 +14728,7 @@ if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then
LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS"
fi
else
- LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng' | sed \
+ 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 \
@@ -14737,9 +14737,9 @@ else
LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
LIBPNG_RULE='# Rebuild libpng
-$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h
+$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h
cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h:
+${top_builddir}/../../libs/libpng/include/png.h:
cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi