diff options
| author | das <das> | 2004-11-11 01:16:41 (GMT) |
|---|---|---|
| committer | das <das> | 2004-11-11 01:16:41 (GMT) |
| commit | a6c92c04cdb54a37f3ad2ae700d83396c811e023 (patch) | |
| tree | 4206cc7a290887ea8af343ebdc9fe5f571270de0 | |
| parent | 55b2cf944b2501328926c9ea94f9036d2ce1f669 (diff) | |
| download | tcl-a6c92c04cdb54a37f3ad2ae700d83396c811e023.zip tcl-a6c92c04cdb54a37f3ad2ae700d83396c811e023.tar.gz tcl-a6c92c04cdb54a37f3ad2ae700d83396c811e023.tar.bz2 | |
* macosx/Makefile: corrected path to html help inside framework.
Prevent parallel make from building several targets at the same
time.
* macosx/tclMacOSXFCmd.c (struct fileinfobuf): force struct to be
packed to prevent failures when builing with -malign=natural.
| -rw-r--r-- | macosx/Makefile | 6 | ||||
| -rw-r--r-- | macosx/tclMacOSXFCmd.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 4c5509f..f3de349 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.16 2004/08/26 16:01:28 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.17 2004/11/11 01:16:41 das Exp $ # ######################################################################################################## @@ -107,7 +107,7 @@ DYLIB_INSTALL_DIR := ${DYLIB_INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${ INCLUDEDIR := ${LIBDIR}/Headers PRIVATEINCLUDEDIR := ${LIBDIR}/PrivateHeaders SCRIPTDIR := ${LIBDIR}/Resources/Scripts -DOCDIR := ${LIBDIR}/Resources/English.lproj/Documentation/Reference +DOCDIR := ${LIBDIR}/Resources/Documentation/Reference INFOPLIST := ${LIBDIR}/Resources/Info.plist BUILD_STYLE = @@ -236,4 +236,6 @@ endif .PHONY: ${meta} ${targets} ${PROJECT} build-${PROJECT} install-${PROJECT} \ clean-${PROJECT} distclean-${PROJECT} +.NOTPARALLEL: + #------------------------------------------------------------------------------------------------------- diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c index 0416dac..4b87157 100644 --- a/macosx/tclMacOSXFCmd.c +++ b/macosx/tclMacOSXFCmd.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacOSXFCmd.c,v 1.2 2004/04/06 22:25:56 dgp Exp $ + * RCS: @(#) $Id: tclMacOSXFCmd.c,v 1.3 2004/11/11 01:16:41 das Exp $ */ #include "tclInt.h" @@ -60,7 +60,7 @@ typedef struct fileinfobuf { u_int32_t padding[4]; } finder; off_t rsrcForkSize; - } data; + } data __attribute__ ((packed)); } fileinfobuf; /* |