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.

diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build
index 1560ee128a97232edb656dabc0113d3ba3508d3c..809f8ff49c77dad9d1c15d6c3369927541868800 100755 (executable)
--- 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 f83d4156101ac00179923f1cdc7de23442e43caa..43313fd943e1b91aa514b65c122f72f30095ab1d 100644 (file)
--- 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 843c50fd4b08c8cea9065ea1b20096005b12b642..5bc17555e1965e46aadd0ea9dbab3be5efa18488 100644 (file)
--- 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