($(outdir)/%.pyc):

Unset PYTHONOPTIMIZE.  Fixes install if set.

diff --git a/ChangeLog b/ChangeLog
index 74a5d3493964e4be6a1da5a1288c3bfdd002ddb1..0c377d7324db9a379ecff82c130b1036e20b4175 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/stepmake/python-module-rules.make ($(outdir)/%.pyc):
+       Unset PYTHONOPTIMIZE.  Fixes install if set.
+
 2005-11-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * python/convertrules.py (conv): add warning about drums. 

diff --git a/stepmake/stepmake/python-module-rules.make b/stepmake/stepmake/python-module-rules.make
index da5575f7127b13cecf3dace13995c8c8f5a29c5f..511bd87afd9e171118b73764c8ffc0c23228b090 100644 (file)
--- a/stepmake/stepmake/python-module-rules.make
+++ b/stepmake/stepmake/python-module-rules.make
@@ -3,7 +3,10 @@ $(outdir)/%$(SHARED_MODULE_SUFFIX): $(outdir)/%.lo
        $(LD) -o $@ $< $(SHARED_FLAGS) $(ALL_LDFLAGS)
 
 $(outdir)/%.pyc: $(outdir)/%.py
-       $(PYTHON) -c 'import py_compile; py_compile.compile ("$<")'
+       PYTHONOPTIMIZE= $(PYTHON) -c 'import py_compile; py_compile.compile ("$<")'
+
+$(outdir)/%.pyo: $(outdir)/%.py
+       $(PYTHON) -O -c 'import py_compile; py_compile.compile ("$<")'
 
 $(outdir)/%.py: %.py $(config_make)
        cat $< | sed $(sed-atvariables) > $@

diff --git a/stepmake/stepmake/python-module-vars.make b/stepmake/stepmake/python-module-vars.make
index 3244ca12bd01c8f2558272c9ae51430fa373b045..cde4c2d405222205cd13d0e06f6d9f3f39bba003 100644 (file)
--- a/stepmake/stepmake/python-module-vars.make
+++ b/stepmake/stepmake/python-module-vars.make
@@ -2,6 +2,7 @@ ALL_LDFLAGS = $(LDFLAGS)
 PY_MODULES_IN = $(call src-wildcard,*.py)
 OUT_PY_MODULES = $(PY_MODULES_IN:%=$(outdir)/%)
 OUT_PYC_MODULES = $(OUT_PY_MODULES:%.py=%.pyc)
+OUT_PYO_MODULES = $(OUT_PY_MODULES:%.py=%.pyo)
 ifeq ($(MINGW_BUILD)$(CYGWIN_BUILD),)
 SHARED_MODULE_SUFFIX = .so
 else