From: janneke <janneke>
Date: Mon, 14 Nov 2005 19:29:49 +0000 (+0000)
Subject: ($(outdir)/%.pyc):
X-Git-Tag: release/2.7.20~58
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c7ac33c4095d6bd979615baa0edd8d5c2591d3dc;p=lilypond.git

($(outdir)/%.pyc):
Unset PYTHONOPTIMIZE.  Fixes install if set.
---

diff --git a/ChangeLog b/ChangeLog
index 74a5d34939..0c377d7324 100644
--- 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 da5575f712..511bd87afd 100644
--- 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 3244ca12bd..cde4c2d405 100644
--- 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