forward port of 1.136.6.2:

$(prefix) wasn't communicated to Mac/OSX/Makefile for all targets. Fixed.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 22856468aa1e9ca94373707af234552ef7f49988..512185f26b7cbad39a0107dc57b36748caa1784c 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -875,13 +875,13 @@ frameworkinstallmaclib:
 frameworkinstallapps:
        $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
                $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
-               srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
+               srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
 
 # 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=. DESTDIR=$(DESTDIR)
+               srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
 
 # This installs the Demos and Tools into the applications directory.
 # It is not part of a normal frameworkinstall