traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Jack Jansen 2001-09-11 14:41:54 +00:00
parent dc795b82aa
commit 127e56e5e8
3 changed files with 419 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.pre.in
View File

@ -675,7 +675,7 @@ libainstall: all
fi; \ fi; \
done done
@if test -d $(LDLIBRARY); then :; else \ @if test -d $(LDLIBRARY); then :; else \
if test -z "$(PYTHONFRAMEWORKDIR)"; then \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
$(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \ $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \
$(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \ $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \
else \ else \
@ -736,9 +736,9 @@ RESSRCDIR=$(srcdir)/Mac/OSXResources/framework
$(PYTHONFRAMEWORKDIR): $(RESSRCDIR)/Info.plist \ $(PYTHONFRAMEWORKDIR): $(RESSRCDIR)/Info.plist \
$(RESSRCDIR)/version.plist \ $(RESSRCDIR)/version.plist \
$(RESSRCDIR)/English.lproj/InfoPlist.strings $(RESSRCDIR)/English.lproj/InfoPlist.strings
@if test -z "$(PYTHONFRAMEWORKDIR)"; then \ @if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
echo Not configured with --enable-framework; \ echo Not configured with --enable-framework; \
exit; \ exit 1; \
else true; \ else true; \
fi fi
$(INSTALL) -d -m $(DIRMODE) $(FRAMEWORKDEST)/Resources/English.lproj $(INSTALL) -d -m $(DIRMODE) $(FRAMEWORKDEST)/Resources/English.lproj
@ -760,9 +760,9 @@ $(PYTHONFRAMEWORKDIR): $(RESSRCDIR)/Info.plist \
frameworkinstall: install frameworkinfrastructureinstall frameworkinstall: install frameworkinfrastructureinstall
FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION) FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
frameworkinfrastructureinstall: $(LDLIBRARY) frameworkinfrastructureinstall: $(LDLIBRARY)
@if test -z "$(PYTHONFRAMEWORKDIR)"; then \ @if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
echo Not configured with --enable-framework; \ echo Not configured with --enable-framework; \
exit; \ exit 1; \
else true; \ else true; \
fi fi
@for i in $(FRAMEWORKFINALDEST)/Resources/English.lproj $(FRAMEWORKFINALDEST)/lib; do\ @for i in $(FRAMEWORKFINALDEST)/Resources/English.lproj $(FRAMEWORKFINALDEST)/lib; do\

793
configure vendored
View File

File diff suppressed because it is too large Load Diff

17
configure.in
View File

@ -15,21 +15,28 @@ CONFIG_ARGS="$ac_configure_args"
AC_ARG_ENABLE(framework, AC_ARG_ENABLE(framework,
[ --enable-framework[=INSTALLDIR] Build (MacOSX|Darwin) framework],[ [ --enable-framework[=INSTALLDIR] Build (MacOSX|Darwin) framework],[
PYTHONFRAMEWORK=Python
PYTHONFRAMEWORKDIR=Python.framework
case $enableval in case $enableval in
yes) yes)
enableval=/Library/Frameworks 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 PYTHONFRAMEWORKPREFIX=$enableval
esac
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
esac
],[ ],[
PYTHONFRAMEWORK= PYTHONFRAMEWORK=
PYTHONFRAMEWORKDIR= PYTHONFRAMEWORKDIR=no-framework
PYTHONFRAMEWORKPREFIX= PYTHONFRAMEWORKPREFIX=
PYTHONFRAMEWORKINSTALLDIR= PYTHONFRAMEWORKINSTALLDIR=
enable_framework= enable_framework=