summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--mac/tclMacResource.c4
-rw-r--r--macosx/Makefile6
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e91cda2..45eefd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-01 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/Makefile: fixed redo prebinding bug when DESTDIR="".
+ * mac/tclMacResource.c: fixed possible NULL dereference (bdesgraupes).
+
2003-09-29 Vince Darley <vincentdarley@users.sourceforge.net>
* generic/tclPathObj.c:
diff --git a/mac/tclMacResource.c b/mac/tclMacResource.c
index 3833a65..52b3587 100644
--- a/mac/tclMacResource.c
+++ b/mac/tclMacResource.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacResource.c,v 1.16 2003/09/05 21:52:12 dgp Exp $
+ * RCS: @(#) $Id: tclMacResource.c,v 1.17 2003/10/01 14:33:49 das Exp $
*/
#include <Errors.h>
@@ -1497,7 +1497,7 @@ Tcl_MacFindResource(
Tcl_DStringFree(&ds);
}
- if (*resource == NULL) {
+ if (resource != NULL && *resource == NULL) {
*releaseIt = 1;
LoadResource(resource);
} else {
diff --git a/macosx/Makefile b/macosx/Makefile
index f976a99..c4e3b71 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.8 2003/09/25 05:34:07 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.9 2003/10/01 14:33:49 das Exp $
#
########################################################################################################
@@ -26,7 +26,7 @@ BINDIR ?= ${PREFIX}/bin
MANDIR ?= ${PREFIX}/man
# set to non-empty value to install manpages in addition to html help:
-INSTALL_MANPAGES ?=
+INSTALL_MANPAGES ?=
TCL_PACKAGE_PATH ?= "~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl \
~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks \
@@ -168,7 +168,7 @@ ifeq (${EMBEDDED_BUILD},1)
-rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&-
else
# redo prebinding
- cd ${INSTALL_ROOT}; \
+ cd ${INSTALL_ROOT}/; \
if [ ! -d usr/lib ]; then mkdir -p usr; ln -fs /usr/lib usr/; RM_USRLIB=1; fi; \
if [ ! -d System ]; then ln -fs /System .; RM_SYSTEM=1; fi; \
redo_prebinding -r . "./${BINDIR}/${TCLSH}"; \