When frameworks are not enabled don't put an empty target in the Makefile.
Older make's can apparently choke on this.
This commit is contained in:
parent
dc795b82aa
commit
127e56e5e8
|
@ -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\
|
||||
|
|
19
configure.in
19
configure.in
|
@ -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=
|
||||
|
|
Loading…
Reference in New Issue