mirror of https://github.com/python/cpython
Oops -- needed to fix another place affected by the change back to
$(MACHDEP) being just the platform name, without "plat-" prefix... (To be precise, the libainstall target was totally broken.)
This commit is contained in:
parent
0bfd146594
commit
86b7db3750
15
Makefile.in
15
Makefile.in
|
@ -251,9 +251,10 @@ maninstall:
|
||||||
$(MANDIR)/man1/python.1
|
$(MANDIR)/man1/python.1
|
||||||
|
|
||||||
# Install the library
|
# Install the library
|
||||||
MACHDEPS= $(MACHDEP)
|
PLATDIR= plat-$(MACHDEP)
|
||||||
|
MACHDEPS= $(PLATDIR)
|
||||||
LIBSUBDIRS= lib-stdwin lib-tk test test/output $(MACHDEPS)
|
LIBSUBDIRS= lib-stdwin lib-tk test test/output $(MACHDEPS)
|
||||||
libinstall: python $(srcdir)/Lib/$(MACHDEP)
|
libinstall: python $(srcdir)/Lib/$(PLATDIR)
|
||||||
@for i in $(SCRIPTDIR) $(LIBDEST); \
|
@for i in $(SCRIPTDIR) $(LIBDEST); \
|
||||||
do \
|
do \
|
||||||
if test ! -d $$i; then \
|
if test ! -d $$i; then \
|
||||||
|
@ -312,13 +313,13 @@ libinstall: python $(srcdir)/Lib/$(MACHDEP)
|
||||||
PYTHONPATH=$(LIBDEST) \
|
PYTHONPATH=$(LIBDEST) \
|
||||||
./python -O $(LIBDEST)/compileall.py $(LIBDEST)
|
./python -O $(LIBDEST)/compileall.py $(LIBDEST)
|
||||||
|
|
||||||
# Create the MACHDEP source directory, if one wasn't distributed..
|
# Create the PLATDIR source directory, if one wasn't distributed..
|
||||||
$(srcdir)/Lib/$(MACHDEP):
|
$(srcdir)/Lib/$(PLATDIR):
|
||||||
mkdir $(srcdir)/Lib/$(MACHDEP)
|
mkdir $(srcdir)/Lib/$(PLATDIR)
|
||||||
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(MACHDEP)/regen
|
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
|
||||||
export PATH; PATH="`pwd`:$$PATH"; \
|
export PATH; PATH="`pwd`:$$PATH"; \
|
||||||
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
|
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
|
||||||
cd $(srcdir)/Lib/$(MACHDEP); ./regen
|
cd $(srcdir)/Lib/$(PLATDIR); ./regen
|
||||||
|
|
||||||
# Install the include files
|
# Install the include files
|
||||||
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
|
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
|
||||||
|
|
Loading…
Reference in New Issue