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

8 files changed, 21 insertions, 15 deletions

diff --git a/Build/source/configure b/Build/source/configure
index 13ff58c687c..8a14b9a2e0c 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for TeX Live 2009-08-07.
+# Generated by GNU Autoconf 2.63 for TeX Live 2009-10-10.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='TeX Live'
 PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2009-08-07'
-PACKAGE_STRING='TeX Live 2009-08-07'
+PACKAGE_VERSION='2009-10-10'
+PACKAGE_STRING='TeX Live 2009-10-10'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 
 ac_unique_file="m4/kpse-pkgs.m4"
@@ -1619,7 +1619,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live 2009-08-07 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2009-10-10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1693,7 +1693,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live 2009-08-07:";;
+     short | recursive ) echo "Configuration of TeX Live 2009-10-10:";;
    esac
   cat <<\_ACEOF
 
@@ -1953,7 +1953,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live configure 2009-08-07
+TeX Live configure 2009-10-10
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1967,7 +1967,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live $as_me 2009-08-07, which was
+It was created by TeX Live $as_me 2009-10-10, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -8810,7 +8810,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live'
- VERSION='2009-08-07'
+ VERSION='2009-10-10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23943,7 +23943,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live $as_me 2009-08-07, which was
+This file was extended by TeX Live $as_me 2009-10-10, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23997,7 +23997,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-TeX Live config.status 2009-08-07
+TeX Live config.status 2009-10-10
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index f5c92da7dbc..5f1598f202a 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([TeX Live], [2009-08-07], [tex-k@tug.org])
+AC_INIT([TeX Live], [2009-10-10], [tex-k@tug.org])
 AC_PREREQ([2.63])
 AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4])
 AC_CONFIG_AUX_DIR([build-aux])
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.