* unix/Makefile.in: make package install directory of bundled

	* unix/configure.in	packages configurable via PACKAGE_DIR makefile
				variable (set to platform-specific default).

	* unix/Makefile.in (*-packages): ensure toplevel targets fail if
				sub-make/configure fails; fix quoting when
				builddir path contains spaces.

	* macosx/GNUmakefile:	add install-packages to install targets.

	* unix/configure:	autoconf-2.59

1 files changed, 49 insertions, 50 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 09dc947..13d4cae 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.254 2008/12/19 10:55:38 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.255 2008/12/20 01:11:10 das Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -80,6 +80,9 @@ HTML_DIR		= @HTML_DIR@
 # Directory in which to install html documentation:
 HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
 
+# Directory in which to install bundled packages:
+PACKAGE_DIR             = @PACKAGE_DIR@
+
 # Package search path.
 TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
 
@@ -149,7 +152,7 @@ SHELL			= @MAKEFILE_SHELL@
 INSTALL_STRIP_PROGRAM   = -s
 INSTALL_STRIP_LIBRARY   = -S -x
 
-INSTALL			= @srcdir@/../unix/install-sh -c
+INSTALL			= $(UNIX_DIR)/install-sh -c
 INSTALL_PROGRAM		= ${INSTALL}
 INSTALL_LIBRARY		= ${INSTALL}
 INSTALL_DATA		= ${INSTALL} -m 644
@@ -744,8 +747,8 @@ install-binaries: binaries
 		else true; \
 		fi; \
 	    done;
-	@if test ! -x $(SRC_DIR)/../unix/install-sh; then \
-	    chmod +x $(SRC_DIR)/../unix/install-sh; \
+	@if test ! -x $(UNIX_DIR)/install-sh; then \
+	    chmod +x $(UNIX_DIR)/install-sh; \
 	    fi
 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
 	@@INSTALL_LIB@
@@ -784,8 +787,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
 		else true; \
 		fi; \
 	    done;
-	@if test ! -x $(SRC_DIR)/../unix/install-sh; then \
-	    chmod +x $(SRC_DIR)/../unix/install-sh; \
+	@if test ! -x $(UNIX_DIR)/install-sh; then \
+	    chmod +x $(UNIX_DIR)/install-sh; \
 	    fi
 	@echo "Installing header files";
 	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
@@ -887,8 +890,8 @@ install-private-headers: libraries
 		else true; \
 		fi; \
 	    done;
-	@if test ! -x $(SRC_DIR)/../unix/install-sh; then \
-	    chmod +x $(SRC_DIR)/../unix/install-sh; \
+	@if test ! -x $(UNIX_DIR)/install-sh; then \
+	    chmod +x $(UNIX_DIR)/install-sh; \
 	    fi
 	@echo "Installing private header files";
 	@for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
@@ -1599,7 +1602,6 @@ tclOOStubLib.o: $(GENERIC_DIR)/tclOOStubLib.c
 .c.o:
 	$(CC) -c $(CC_SWITCHES) $<
 
-
 #
 # Bundled Package targets
 #
@@ -1609,99 +1611,96 @@ PKG_CFG_ARGS   =	@PKG_CFG_ARGS@
 PKG_DIR                = ./pkgs
 
 configure-packages:
-	@builddir=`pwd`; \
+	@builddir="`pwd`"; \
 	for i in $(PKGS_DIR)/*; do \
 	  if [ -d $$i ]; then \
 	    if [ -x $$i/configure ]; then \
-	        pkg=`basename $$i`; \
-	        echo "Configuring package '$$pkg'"; \
-	        mkdir -p $(PKG_DIR)/$$pkg; \
-	        if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
-	            ( cd $(PKG_DIR)/$$pkg; \
-	              $$i/configure --with-tcl=$(PWD) --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
-	        fi; \
+	      pkg=`basename $$i`; \
+	      echo "Configuring package '$$pkg'"; \
+	      mkdir -p $(PKG_DIR)/$$pkg; \
+	      if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
+		( cd $(PKG_DIR)/$$pkg; \
+		  $$i/configure --with-tcl="$${builddir}" \
+		      --with-tclinclude=$(GENERIC_DIR) \
+		      $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
+		      --enable-shared --enable-threads; ) || exit $$?; \
+	      fi; \
 	    fi; \
 	  fi; \
-	done; \
-	cd $$builddir
+	done
 
 packages: configure-packages ${STUB_LIB_FILE}
-	@builddir=`pwd`; \
-	for i in $(PKGS_DIR)/*; do \
+	@for i in $(PKGS_DIR)/*; do \
 	  if [ -d $$i ]; then \
 	    pkg=`basename $$i`; \
 	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
-	        echo "Building package '$$pkg'"; \
-	        ( cd $(PKG_DIR)/$$pkg; $(MAKE); ) \
+	      echo "Building package '$$pkg'"; \
+	      ( cd $(PKG_DIR)/$$pkg; $(MAKE); ) || exit $$?; \
 	    fi; \
 	  fi; \
-	done; \
-	cd $$builddir
+	done
 
 install-packages: packages
-	@builddir=`pwd`; \
-	for i in $(PKGS_DIR)/*; do \
+	@for i in $(PKGS_DIR)/*; do \
 	  if [ -d $$i ]; then \
 	    pkg=`basename $$i`; \
 	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
-	        echo "Installing package '$$pkg'"; \
-	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) install "DESTDIR=$(INSTALL_ROOT)"; ) \
+	      echo "Installing package '$$pkg'"; \
+	      ( cd $(PKG_DIR)/$$pkg; $(MAKE) install \
+		  "DESTDIR=$(INSTALL_ROOT)"; ) || exit $$?; \
 	    fi; \
 	  fi; \
-	done; \
-	cd $$builddir
+	done
 
 test-packages: tcltest packages
-	@builddir=`pwd`; \
+	@builddir="`pwd`"; \
 	for i in $(PKGS_DIR)/*; do \
 	  if [ -d $$i ]; then \
 	    pkg=`basename $$i`; \
 	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
-	        echo "Testing package '$$pkg'"; \
-	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) "LD_LIBRARY_PATH=$$builddir:${LD_LIBRARY_PATH}" "TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" "TCLLIBPATH=$$builddir/pkgs" test "TCLSH_PROG=$$builddir/tcltest"; ) \
+	      echo "Testing package '$$pkg'"; \
+	      ( cd $(PKG_DIR)/$$pkg; $(MAKE) \
+		  "@LD_LIBRARY_PATH_VAR@=$${builddir}:$${@LD_LIBRARY_PATH_VAR@}" \
+		  "TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" \
+		  "TCLLIBPATH=$${builddir}/pkgs" test \
+		  "TCLSH_PROG=$${builddir}/tcltest"; ) \
 	    fi; \
 	  fi; \
-	done; \
-	cd $$builddir
+	done
 
 clean-packages:
-	@builddir=`pwd`; \
-	for i in $(PKGS_DIR)/*; do \
+	@for i in $(PKGS_DIR)/*; do \
 	  if [ -d $$i ]; then \
 	    pkg=`basename $$i`; \
 	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
-	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) clean; ) \
+	      ( cd $(PKG_DIR)/$$pkg; $(MAKE) clean; ) \
 	    fi; \
 	  fi; \
-	done; \
-	cd $$builddir
+	done
 
 distclean-packages:
-	@builddir=`pwd`; \
-	for i in $(PKGS_DIR)/*; do \
+	@for i in $(PKGS_DIR)/*; do \
 	  if [ -d $$i ]; then \
 	    pkg=`basename $$i`; \
 	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
-	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) distclean; ) \
+	      ( cd $(PKG_DIR)/$$pkg; $(MAKE) distclean; ) \
 	    fi; \
-	    cd $$builddir; \
 	    rm -rf $(PKG_DIR)/$$pkg; \
 	  fi; \
 	done; \
 	rm -rf $(PKG_DIR)
 
 dist-packages: configure-packages
-	@builddir=`pwd`; \
-	rm -rf $(DISTROOT)/pkgs; \
+	@rm -rf $(DISTROOT)/pkgs; \
 	for i in $(PKGS_DIR)/*; do \
 	  if [ -d $$i ]; then \
 	    pkg=`basename $$i`; \
 	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
-	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) dist "DIST_ROOT=$(DISTROOT)/pkgs"; ) \
+	      ( cd $(PKG_DIR)/$$pkg; $(MAKE) dist \
+		  "DIST_ROOT=$(DISTROOT)/pkgs"; ) || exit $$?; \
 	    fi; \
 	  fi; \
-	done; \
-	cd $$builddir
+	done
 
 #
 # Target to regenerate header files and stub files from the *.decls tables.