diff options
| author | Andrew M. Kuchling <amk@amk.ca> | 2001-01-26 22:52:45 (GMT) |
|---|---|---|
| committer | Andrew M. Kuchling <amk@amk.ca> | 2001-01-26 22:52:45 (GMT) |
| commit | 03184e2815fcff16c34f857a36ce177cd2a244f4 (patch) | |
| tree | f85c9f4892187ad52c74d79582aae90e24ef53ca | |
| parent | 73f8ab2e61cff44c5b979a960c9591e7f92862dc (diff) | |
| download | cpython-03184e2815fcff16c34f857a36ce177cd2a244f4.zip cpython-03184e2815fcff16c34f857a36ce177cd2a244f4.tar.gz cpython-03184e2815fcff16c34f857a36ce177cd2a244f4.tar.bz2 | |
Remaining single-line change from patch #102409: to install shared modules,
run setup.py with the --install-platlib flag so you can override
'prefix' when running make (e.g. make prefix=/tmp/python/usr/local install)
Instead of using mkdir to create directories, use install -d (mkdir -p
apparently isn't portable)
Emacs make-mode reported line 371 as suspicious; removed the whitespace from
that line.
| -rw-r--r-- | Makefile.pre.in | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 970e1d7..752c1d4d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -368,7 +368,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno $(CC) -c $(PY_CFLAGS) -DBUILD=`cat buildno` -o $@ $< - + Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ -DPREFIX='"$(prefix)"' \ @@ -485,8 +485,7 @@ $(DESTSHARED): do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ - mkdir $$i; \ - chmod 755 $$i; \ + $(INSTALL) -d 755 $$i; \ else true; \ fi; \ done @@ -507,8 +506,7 @@ altbininstall: $(PYTHON) do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ - mkdir $$i; \ - chmod $(DIRMODE) $$i; \ + $(INSTALL) -d $(DIRMODE) $$i; \ else true; \ fi; \ done @@ -528,8 +526,7 @@ maninstall: do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ - mkdir $$i; \ - chmod $(DIRMODE) $$i; \ + $(INSTALL) -d $(DIRMODE) $$i; \ else true; \ fi; \ done @@ -547,8 +544,7 @@ libinstall: python $(srcdir)/Lib/$(PLATDIR) do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ - mkdir $$i; \ - chmod $(DIRMODE) $$i; \ + $(INSTALL) -d $(DIRMODE) $$i; \ else true; \ fi; \ done @@ -559,8 +555,7 @@ libinstall: python $(srcdir)/Lib/$(PLATDIR) b=$(LIBDEST)/$$d; \ if test ! -d $$b; then \ echo "Creating directory $$b"; \ - mkdir $$b; \ - chmod $(DIRMODE) $$b; \ + $(INSTALL) -d $(DIRMODE) $$b; \ else true; \ fi; \ done @@ -620,8 +615,7 @@ inclinstall: do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ - mkdir $$i; \ - chmod $(DIRMODE) $$i; \ + $(INSTALL) -d $(DIRMODE) $$i; \ else true; \ fi; \ done @@ -640,8 +634,7 @@ libainstall: all do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ - mkdir $$i; \ - chmod $(DIRMODE) $$i; \ + $(INSTALL) -d $(DIRMODE) $$i; \ else true; \ fi; \ done @@ -691,7 +684,8 @@ libainstall: all # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: - ./$(PYTHON) $(srcdir)/setup.py install + ./python$(EXE) $(srcdir)/setup.py install \ + --install-platlib=$(DESTSHARED) # Build the toplevel Makefile Makefile.pre: Makefile.pre.in config.status |