summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--generic/tclPort.h6
-rw-r--r--macosx/Makefile4
-rw-r--r--unix/Makefile.in4
4 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c395632..e8f26f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-24 Daniel Steffen <das@users.sourceforge.net>
+
+ * generic/tclPort.h:
+ * macosx/Makefile:
+ * unix/Makefile.in: followup on tcl header reform [FR 922727]:
+ removed use of relative #include paths in tclPort.h to allow
+ installation of private headers outside of tcl source tree; added
+ 'unix' dir to compiler header search path; add newly required
+ tcl private headers to Tcl.framework on Mac OSX.
+
2004-04-23 Andreas Kupries <andreask@activestate.com>
* generic/tclIO.c (Tcl_SetChannelOption): Fixed [SF Tcl Bug
diff --git a/generic/tclPort.h b/generic/tclPort.h
index 2f82fa1..5cea76b 100644
--- a/generic/tclPort.h
+++ b/generic/tclPort.h
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPort.h,v 1.8 2004/03/17 18:14:14 das Exp $
+ * RCS: @(#) $Id: tclPort.h,v 1.9 2004/04/24 05:59:18 das Exp $
*/
#ifndef _TCLPORT
@@ -19,9 +19,9 @@
#include "tcl.h"
#if defined(__WIN32__)
-# include "../win/tclWinPort.h"
+# include "tclWinPort.h"
#else
-# include "../unix/tclUnixPort.h"
+# include "tclUnixPort.h"
#endif
#if !defined(LLONG_MIN)
diff --git a/macosx/Makefile b/macosx/Makefile
index 036bd8a..6e11dc0 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.13 2004/04/06 22:25:56 dgp Exp $
+# RCS: @(#) $Id: Makefile,v 1.14 2004/04/24 05:59:18 das Exp $
#
########################################################################################################
@@ -94,7 +94,7 @@ PRODUCT_LONGVERSION := $(shell eval $$(grep '^TCL_PATCH_LEVEL=' ${UNIX_DIR}/conf
echo "${PRODUCT_VERSION}$${TCL_PATCH_LEVEL}")
YEAR := $(shell date +%Y)
-PRIVATE_HEADERS := tclInt.h tclIntDecls.h tclIntPlatDecls.h
+PRIVATE_HEADERS := tclInt.h tclIntDecls.h tclIntPlatDecls.h tclPort.h ../unix/tclUnixPort.h
TARGETS := tclsh tcltest
TCLSH := tclsh${PRODUCT_VERSION}
TCL_EXE ?= ${SYMROOT}/${TCLSH}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d3da619..ba9490a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.135 2004/03/17 18:14:18 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.136 2004/04/24 05:59:19 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -277,7 +277,7 @@ DDD = ddd
CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${GENERIC_DIR} -I${SRC_DIR} \
+-I${GENERIC_DIR} -I${UNIX_DIR} -I${SRC_DIR} \
${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} ${ENV_FLAGS} \
-DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"