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.
This commit is contained in:
Andrew M. Kuchling 2001-01-26 22:52:45 +00:00
parent 73f8ab2e61
commit 03184e2815

View file

@ -368,7 +368,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist
Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
$(CC) -c $(PY_CFLAGS) -DBUILD=`cat buildno` -o $@ $< $(CC) -c $(PY_CFLAGS) -DBUILD=`cat buildno` -o $@ $<
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
-DPREFIX='"$(prefix)"' \ -DPREFIX='"$(prefix)"' \
@ -485,8 +485,7 @@ $(DESTSHARED):
do \ do \
if test ! -d $$i; then \ if test ! -d $$i; then \
echo "Creating directory $$i"; \ echo "Creating directory $$i"; \
mkdir $$i; \ $(INSTALL) -d 755 $$i; \
chmod 755 $$i; \
else true; \ else true; \
fi; \ fi; \
done done
@ -507,8 +506,7 @@ altbininstall: $(PYTHON)
do \ do \
if test ! -d $$i; then \ if test ! -d $$i; then \
echo "Creating directory $$i"; \ echo "Creating directory $$i"; \
mkdir $$i; \ $(INSTALL) -d $(DIRMODE) $$i; \
chmod $(DIRMODE) $$i; \
else true; \ else true; \
fi; \ fi; \
done done
@ -528,8 +526,7 @@ maninstall:
do \ do \
if test ! -d $$i; then \ if test ! -d $$i; then \
echo "Creating directory $$i"; \ echo "Creating directory $$i"; \
mkdir $$i; \ $(INSTALL) -d $(DIRMODE) $$i; \
chmod $(DIRMODE) $$i; \
else true; \ else true; \
fi; \ fi; \
done done
@ -547,8 +544,7 @@ libinstall: python $(srcdir)/Lib/$(PLATDIR)
do \ do \
if test ! -d $$i; then \ if test ! -d $$i; then \
echo "Creating directory $$i"; \ echo "Creating directory $$i"; \
mkdir $$i; \ $(INSTALL) -d $(DIRMODE) $$i; \
chmod $(DIRMODE) $$i; \
else true; \ else true; \
fi; \ fi; \
done done
@ -559,8 +555,7 @@ libinstall: python $(srcdir)/Lib/$(PLATDIR)
b=$(LIBDEST)/$$d; \ b=$(LIBDEST)/$$d; \
if test ! -d $$b; then \ if test ! -d $$b; then \
echo "Creating directory $$b"; \ echo "Creating directory $$b"; \
mkdir $$b; \ $(INSTALL) -d $(DIRMODE) $$b; \
chmod $(DIRMODE) $$b; \
else true; \ else true; \
fi; \ fi; \
done done
@ -620,8 +615,7 @@ inclinstall:
do \ do \
if test ! -d $$i; then \ if test ! -d $$i; then \
echo "Creating directory $$i"; \ echo "Creating directory $$i"; \
mkdir $$i; \ $(INSTALL) -d $(DIRMODE) $$i; \
chmod $(DIRMODE) $$i; \
else true; \ else true; \
fi; \ fi; \
done done
@ -640,8 +634,7 @@ libainstall: all
do \ do \
if test ! -d $$i; then \ if test ! -d $$i; then \
echo "Creating directory $$i"; \ echo "Creating directory $$i"; \
mkdir $$i; \ $(INSTALL) -d $(DIRMODE) $$i; \
chmod $(DIRMODE) $$i; \
else true; \ else true; \
fi; \ fi; \
done done
@ -691,7 +684,8 @@ libainstall: all
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedinstall:
./$(PYTHON) $(srcdir)/setup.py install ./python$(EXE) $(srcdir)/setup.py install \
--install-platlib=$(DESTSHARED)
# Build the toplevel Makefile # Build the toplevel Makefile
Makefile.pre: Makefile.pre.in config.status Makefile.pre: Makefile.pre.in config.status