From a226b5723a780bd96ba5c9ecb9c05f578ceacc72 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 9 May 2003 15:08:39 +0000
Subject: Pass DIRMODE and FILEMODE to Mac/OSX/Makefile on framework builds
 (and honor them). Use this when building the MacOSX binary installer to get
 group-writeable files.

Ths fix works for directories and executables, not for files just yet,
because of bug #735274.
---
 Mac/OSX/Dist/build | 2 +-
 Mac/OSX/Makefile   | 3 ++-
 Makefile.pre.in    | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build
index 1560ee1..809f8ff 100755
--- a/Mac/OSX/Dist/build
+++ b/Mac/OSX/Dist/build
@@ -70,7 +70,7 @@ fi
 
 $PYTHONSRC/configure --enable-framework=$INSTALLROOT/Library/Frameworks LDFLAGS=-Wl,-x
 make
-make frameworkinstall
+make DIRMODE=775 EXEMODE=775 FILEMODE=664 frameworkinstall
 
 if [ "$builddocs" = "y" -o "$builddocs" = "Y" ]; then
     ./python.exe $PYTHONSRC/Mac/OSX/setupDocs.py build
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index f83d415..43313fd 100644
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -22,11 +22,12 @@ INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
 
 # Items more-or-less copied from the main Makefile
 DIRMODE=755
+FILEMODE=644
 INSTALL=/usr/bin/install -c
 INSTALL_SYMLINK=ln -fs
 INSTALL_PROGRAM=${INSTALL}
 INSTALL_SCRIPT= ${INSTALL_PROGRAM}
-INSTALL_DATA=	${INSTALL} -m 644
+INSTALL_DATA=	${INSTALL} -m ${FILEMODE}
 LN=ln
 STRIPFLAG=-s
 ##OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 843c50f..5bc1755 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -853,18 +853,19 @@ frameworkinstallstructure:	$(LDLIBRARY)
 # This installs Mac/Lib into the framework
 frameworkinstallmaclib:
 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
-		BUILDPYTHON=./$(BUILDPYTHON) \
+		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
 		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST)
 
 # This installs the IDE, the Launcher and other apps into /Applications
 frameworkinstallapps:
 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
-		BUILDPYTHON=./$(BUILDPYTHON) \
+		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
 		srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
 
 # This install the unix python and pythonw tools in /usr/local/bin
 frameworkinstallunixtools:
 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
+		DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
 		srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
 
 # This installs IDLE
-- 
cgit v0.12