From 20105d8fee7ad158025085192b3a3b57340b9135 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Thu, 25 Sep 2003 05:34:18 +0000
Subject: 	* macosx/Makefile: ensure SYMROOT exists if OBJROOT is
 overridden 	on command line. Replaced explict use of /usr/bin by
 ${BINDIR}.

---
 ChangeLog       | 13 +++++++++----
 macosx/Makefile | 11 +++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0c280c..41ec0ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-25  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/Makefile: ensure SYMROOT exists if OBJROOT is overridden 
+	on command line. Replaced explict use of /usr/bin by ${BINDIR}.
+
 2003-09-23  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclCmdMZ.c ():		Fixed [Bug 807243] where
@@ -5,10 +10,10 @@
 	of both [trace info command] and [trace info execution] were getting
 	co-mingled.  Thanks to Mark Saye for the report.
 
-        * library/init.tcl (auto_load, auto_import):  Expanded Eric Melski's
-        2000-01-28 fix for [Bug 218871] to all potentially troubled uses of
-        [info commands] on input data, where glob-special characters could
-        cause problems.
+	* library/init.tcl (auto_load, auto_import):  Expanded Eric Melski's
+	2000-01-28 fix for [Bug 218871] to all potentially troubled uses of
+	[info commands] on input data, where glob-special characters could
+	cause problems.
 
 2003-09-19  Miguel Sofer <msofer@users.sf.net>
 
diff --git a/macosx/Makefile b/macosx/Makefile
index 781a19d..5be4a84 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
 # Makefile to build Tcl on Mac OS X packaged as a Framework
 #	uses standard unix build system in tcl/unix
 #
-# RCS: @(#) $Id: Makefile,v 1.5.2.3 2003/07/19 01:35:01 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.5.2.4 2003/09/25 05:34:18 das Exp $
 #
 ########################################################################################################
 
@@ -131,7 +131,7 @@ build-${PROJECT}: ${OBJ_DIR}/Makefile
 # symolic link hackery to trick
 # 'make install INSTALL_ROOT=${OBJ_DIR}'
 # into building Tcl.framework and tclsh in ${SYMROOT}
-	cd ${OBJ_DIR}; mkdir -p $(dir ./${INSTALL_PATH}) $(dir ./${BINDIR}); \
+	cd ${OBJ_DIR}; mkdir -p $(dir ./${INSTALL_PATH}) $(dir ./${BINDIR}) ${SYMROOT}; \
 	rm -f ./${INSTALL_PATH}; ln -fs ${SYMROOT} ./${INSTALL_PATH}; \
 	rm -f ./${BINDIR}; ln -fs ${SYMROOT} ./${BINDIR}; \
 	ln -fs ${OBJ_DIR}/tcltest ${SYMROOT}
@@ -164,8 +164,8 @@ endif
 ifeq (${INSTALL_BUILD},1)
 ifeq (${EMBEDDED_BUILD},1)
 # if we are embedding frameworks, don't install tclsh
-	rm -f "${INSTALL_ROOT}/${BINDIR}/${TCLSH}"
-	-rmdir -p "${INSTALL_ROOT}/${BINDIR}" 2>&-
+	rm -f "${INSTALL_ROOT}${BINDIR}/${TCLSH}"
+	-rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&-
 else
 # redo prebinding
 	cd ${INSTALL_ROOT}; \
@@ -175,8 +175,7 @@ else
 	if [ -n "$${RM_USRLIB:-}" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi; \
 	if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi
 # install tclsh symbolic link
-	mkdir -p ${INSTALL_ROOT}/usr/bin && \
-	ln -fs ${TCLSH} ${INSTALL_ROOT}/${BINDIR}/tclsh
+	ln -fs ${TCLSH} ${INSTALL_ROOT}${BINDIR}/tclsh
 ifeq (${BUILD_STYLE},Deployment)
 ifneq (${INSTALL_MANPAGES},)
 # install manpages
-- 
cgit v0.12