diff options
| author | Fred Drake <fdrake@acm.org> | 2001-03-06 05:52:16 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2001-03-06 05:52:16 (GMT) |
| commit | a1a84e7d4f7b493bb6fa5415ce55d3f722221470 (patch) | |
| tree | cc41a82403ef79d97d108b1d750489a415604aa4 /Makefile.pre.in | |
| parent | b25ec91a94e006dc7b4776e6b3b781b0dc818336 (diff) | |
| download | cpython-a1a84e7d4f7b493bb6fa5415ce55d3f722221470.zip cpython-a1a84e7d4f7b493bb6fa5415ce55d3f722221470.tar.gz cpython-a1a84e7d4f7b493bb6fa5415ce55d3f722221470.tar.bz2 | |
Move all knowledge that $(MAINOBJ) is built in the Modules/ directory
into Makefile.pre.in; the configure script will only determine the basename
of the file.
This fixes installation of a Python built using C++, reported by Greg
Wilson.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 8876d2f..2006092 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -272,8 +272,9 @@ LIBRARY_OBJS= \ all: $(PYTHON) oldsharedmods sharedmods # Build the interpreter -$(PYTHON): $(MAINOBJ) $(LDLIBRARY) - $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ $(MAINOBJ) \ +$(PYTHON): Modules/$(MAINOBJ) $(LDLIBRARY) + $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ + Modules/$(MAINOBJ) \ $(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) platform: $(PYTHON) @@ -451,7 +452,7 @@ PYTHON_HEADERS= \ Include/abstract.h \ Include/pyfpe.h -$(LIBRARY_OBJS) $(MODOBJS) $(MAINOBJ): $(PYTHON_HEADERS) +$(LIBRARY_OBJS) $(MODOBJS) Modules/$(MAINOBJ): $(PYTHON_HEADERS) ###################################################################### @@ -661,7 +662,7 @@ libainstall: all $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \ fi $(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c - $(INSTALL_DATA) Modules/python.o $(LIBPL)/python.o + $(INSTALL_DATA) Modules/$(MAINOBJ) $(LIBPL)/$(MAINOBJ) $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in $(INSTALL_DATA) Makefile $(LIBPL)/Makefile $(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup |