summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-10-10 12:05:04 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-10-10 12:05:04 +0000
commitd3d37e8618b8fe2263ffe0ec31aec43909f8c45c (patch)
tree16723f176782170be9cf3aef568b4f5dd1419e7b /Build/source/libs
parent39d7f101620af8cce9ceebd468d52ad208d07659 (diff)
build system: fix for non-VPATH build (may still require GNU make)
git-svn-id: svn://tug.org/texlive/trunk@15737 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/freetype2/Makefile.am2
-rw-r--r--Build/source/libs/freetype2/Makefile.in2
-rwxr-xr-xBuild/source/libs/icu/configure2
-rw-r--r--Build/source/libs/icu/configure.ac2
-rw-r--r--Build/source/libs/icu/dummy/Makefile.am3
-rw-r--r--Build/source/libs/icu/dummy/Makefile.in3
6 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 8d3ac6d859e..e9b93c5a0e0 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -53,5 +53,5 @@ libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
@for f in libfreetype.*; do touch $$f; done
clean-local:
- rm -rf freetype* ft2build.h ft-* libfreetype.* pkgconfig
+ rm -rf freetype2 ft2build.h ft-* libfreetype.* pkgconfig
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index 48968686325..a932351ec8c 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -498,7 +498,7 @@ libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
@for f in libfreetype.*; do touch $$f; done
clean-local:
- rm -rf freetype* ft2build.h ft-* libfreetype.* pkgconfig
+ rm -rf freetype2 ft2build.h ft-* libfreetype.* pkgconfig
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
index 939637e0a32..69b07f2acc5 100755
--- a/Build/source/libs/icu/configure
+++ b/Build/source/libs/icu/configure
@@ -2311,6 +2311,8 @@ else
fi
+test "x$srcdir" = x. && srcdir=../icu
+
subdirs="$subdirs dummy"
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
index 59d73ed7f9b..05b3572dda9 100644
--- a/Build/source/libs/icu/configure.ac
+++ b/Build/source/libs/icu/configure.ac
@@ -17,6 +17,8 @@ AM_MAINTAINER_MODE
AM_CONDITIONAL([build], [test "x$enable_build" != xno])
+test "x$srcdir" = x. && srcdir=../icu
+
AC_CONFIG_SUBDIRS([dummy])
AC_CONFIG_FILES([Makefile])
diff --git a/Build/source/libs/icu/dummy/Makefile.am b/Build/source/libs/icu/dummy/Makefile.am
index d7298a04afe..1804cbd4387 100644
--- a/Build/source/libs/icu/dummy/Makefile.am
+++ b/Build/source/libs/icu/dummy/Makefile.am
@@ -10,5 +10,6 @@ DISTCLEANFILES = $(noinst_DATA)
all-local: $(noinst_DATA)
../icusubdir-configure:
- echo "${srcdir}/configure" | sed 's,icu/dummy/,icu/icu-xetex/,' >$@
+ d=$(srcdir); test "x$$d" = x. && d=../../icu/dummy; \
+ echo "$$d/configure" | sed 's,icu/dummy/,icu/icu-xetex/,' >$@
diff --git a/Build/source/libs/icu/dummy/Makefile.in b/Build/source/libs/icu/dummy/Makefile.in
index 803a51e317c..749b0e86406 100644
--- a/Build/source/libs/icu/dummy/Makefile.in
+++ b/Build/source/libs/icu/dummy/Makefile.in
@@ -449,7 +449,8 @@ uninstall-am:
all-local: $(noinst_DATA)
../icusubdir-configure:
- echo "${srcdir}/configure" | sed 's,icu/dummy/,icu/icu-xetex/,' >$@
+ d=$(srcdir); test "x$$d" = x. && d=../../icu/dummy; \
+ echo "$$d/configure" | sed 's,icu/dummy/,icu/icu-xetex/,' >$@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.