Set -d in compileall, to get proper path in case DESTDIR is not empty.

Also add force, to recompile string.pyc in DESTDIR (which would normally
compiled by running compileall.py).

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 735ec3c4b7e7612127c4c5dc313d54c88f243a30..27e8090f8325cbedfdfe3c8635b03cdd1138d7eb 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -703,15 +703,19 @@ libinstall:       $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
        $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
        PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
                ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+               -d $(LIBDEST) -f \
                -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
        PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+               -d $(LIBDEST) -f \
                -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
        PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
                ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+               -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
        PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+               -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 
 # Create the PLATDIR source directory, if one wasn't distributed..