Kaydet (Commit) 127e56e5 authored tarafından Jack Jansen's avatar Jack Jansen

When frameworks are not enabled don't put an empty target in the Makefile.

Older make's can apparently choke on this.
üst dc795b82
......@@ -675,7 +675,7 @@ libainstall: all
fi; \
done
@if test -d $(LDLIBRARY); then :; else \
if test -z "$(PYTHONFRAMEWORKDIR)"; then \
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
$(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \
$(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \
else \
......@@ -736,9 +736,9 @@ RESSRCDIR=$(srcdir)/Mac/OSXResources/framework
$(PYTHONFRAMEWORKDIR): $(RESSRCDIR)/Info.plist \
$(RESSRCDIR)/version.plist \
$(RESSRCDIR)/English.lproj/InfoPlist.strings
@if test -z "$(PYTHONFRAMEWORKDIR)"; then \
@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
echo Not configured with --enable-framework; \
exit; \
exit 1; \
else true; \
fi
$(INSTALL) -d -m $(DIRMODE) $(FRAMEWORKDEST)/Resources/English.lproj
......@@ -760,9 +760,9 @@ $(PYTHONFRAMEWORKDIR): $(RESSRCDIR)/Info.plist \
frameworkinstall: install frameworkinfrastructureinstall
FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
frameworkinfrastructureinstall: $(LDLIBRARY)
@if test -z "$(PYTHONFRAMEWORKDIR)"; then \
@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
echo Not configured with --enable-framework; \
exit; \
exit 1; \
else true; \
fi
@for i in $(FRAMEWORKFINALDEST)/Resources/English.lproj $(FRAMEWORKFINALDEST)/lib; do\
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -15,21 +15,28 @@ CONFIG_ARGS="$ac_configure_args"
AC_ARG_ENABLE(framework,
[ --enable-framework[=INSTALLDIR] Build (MacOSX|Darwin) framework],[
PYTHONFRAMEWORK=Python
PYTHONFRAMEWORKDIR=Python.framework
case $enableval in
yes)
enableval=/Library/Frameworks
PYTHONFRAMEWORKPREFIX=$enableval
esac
case $enableval in
no)
PYTHONFRAMEWORK=
PYTHONFRAMEWORKDIR=no-framework
PYTHONFRAMEWORKPREFIX=
PYTHONFRAMEWORKINSTALLDIR=
enable_framework=
;;
*)
PYTHONFRAMEWORK=Python
PYTHONFRAMEWORKDIR=Python.framework
PYTHONFRAMEWORKPREFIX=$enableval
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
esac
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
],[
PYTHONFRAMEWORK=
PYTHONFRAMEWORKDIR=
PYTHONFRAMEWORKDIR=no-framework
PYTHONFRAMEWORKPREFIX=
PYTHONFRAMEWORKINSTALLDIR=
enable_framework=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment