In the altbininstall target, which is the first subtarget for "make install",
if we are running in an OSX framework enabled build directory, test that the framework infrastructure exists. This catches the very common error of doing "make install" in stead of "make frameworkinstall".
This commit is contained in:
parent
9c5b61b21b
commit
3a451b1d19
|
@ -569,6 +569,12 @@ bininstall: altbininstall
|
||||||
# Install the interpreter with $(VERSION) affixed
|
# Install the interpreter with $(VERSION) affixed
|
||||||
# This goes into $(exec_prefix)
|
# This goes into $(exec_prefix)
|
||||||
altbininstall: $(BUILDPYTHON)
|
altbininstall: $(BUILDPYTHON)
|
||||||
|
@if test "$(PYTHONFRAMEWORKDIR)" != no-framework; then \
|
||||||
|
if test ! -f $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current/Resources/Info.plist; then \
|
||||||
|
echo 'Framework build: use "make frameworkinstall" in stead of "make install"'; \
|
||||||
|
exit 1; \
|
||||||
|
fi; \
|
||||||
|
fi
|
||||||
@for i in $(BINDIR) $(LIBDIR); \
|
@for i in $(BINDIR) $(LIBDIR); \
|
||||||
do \
|
do \
|
||||||
if test ! -d $$i; then \
|
if test ! -d $$i; then \
|
||||||
|
@ -770,7 +776,7 @@ sharedinstall:
|
||||||
# automatically set prefix to the location deep down in the framework, so we
|
# automatically set prefix to the location deep down in the framework, so we
|
||||||
# only have to cater for the structural bits of the framework.
|
# only have to cater for the structural bits of the framework.
|
||||||
|
|
||||||
frameworkinstall: install frameworkinfrastructureinstall
|
frameworkinstall: frameworkinfrastructureinstall install
|
||||||
FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
|
FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
|
||||||
frameworkinfrastructureinstall: $(LDLIBRARY)
|
frameworkinfrastructureinstall: $(LDLIBRARY)
|
||||||
@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
||||||
|
|
Loading…
Reference in New Issue