summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1994-09-12 15:35:36 (GMT)
committerGuido van Rossum <guido@python.org>1994-09-12 15:35:36 (GMT)
commitf5e0ea89db4475a79a6bd6cb5e10c2e0c0ff602f (patch)
treed6e3438901e7a6fa1ddfb835cda30961f18671bc
parent73737abeadbfd000fe21b6c2332558b2f5546c74 (diff)
downloadcpython-f5e0ea89db4475a79a6bd6cb5e10c2e0c0ff602f.zip
cpython-f5e0ea89db4475a79a6bd6cb5e10c2e0c0ff602f.tar.gz
cpython-f5e0ea89db4475a79a6bd6cb5e10c2e0c0ff602f.tar.bz2
* Modules/Setup.in: define PYTHONPATH using COREPYTHONPATH for
extensions; add -lm to math module definition * Modules/Makefile.pre.in: remove *.so and so_locations on clobber
-rw-r--r--Modules/Makefile.pre.in1
-rw-r--r--Modules/Setup.in5
2 files changed, 4 insertions, 2 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 39c3b7c..ff1ca9c 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -88,6 +88,7 @@ clean:
clobber: clean
-rm -f *.a tags TAGS config.c glmodule.c Makefile.pre
+ -rm -f *.so so_locations
config.c Makefile: Makefile.pre config.c.in $(MAKESETUP) Setup
$(SHELL) $(MAKESETUP) Setup
diff --git a/Modules/Setup.in b/Modules/Setup.in
index af7d235..ffbf64f 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -60,13 +60,14 @@ TESTPATH=:$(DESTLIB)/test
# Path for machine- or system-dependent modules (and shared libraries)
MACHDEPPATH=:$(DESTLIB)/$(MACHDEP)
-PYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
+COREPYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
+PYTHONPATH=$(COREPYTHONPATH)
# Modules that should always be present (non UNIX dependent)
array arraymodule.c # array objects
-math mathmodule.c # math library functions, e.g. sin()
+math mathmodule.c -lm # math library functions, e.g. sin()
parser parsermodule.c # raw interface to the Python parser
posix posixmodule.c # posix (UNIX) system calls
regex regexmodule.c regexpr.c # Regular expressions, GNU Emacs style