[Commits] (heikki) Check PYLUCENE_* environment variables, and if they are set, use those rather than the defaults for CC, JCC and so forth. This helps on Fedora Core 2, for example, where gcj 3.4 is named gcj34 etc.

commits at osafoundation.org commits at osafoundation.org
Tue Aug 31 14:29:38 PDT 2004


Commit by: heikki
Modified files:
external/PyLucene/Makefile 1.4 1.5

Log message:
Check PYLUCENE_* environment variables, and if they are set, use those rather than the defaults for CC, JCC and so forth. This helps on Fedora Core 2, for example, where gcj 3.4 is named gcj34 etc.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/PyLucene/Makefile.diff?r1=text&tr1=1.4&r2=text&tr2=1.5

Index: external/PyLucene/Makefile
diff -u external/PyLucene/Makefile:1.4 external/PyLucene/Makefile:1.5
--- external/PyLucene/Makefile:1.4	Mon Aug 23 17:03:39 2004
+++ external/PyLucene/Makefile	Tue Aug 31 14:29:36 2004
@@ -52,12 +52,33 @@
 	   patch -Nup0 < patches-$(VERSION); echo ok; \
 	fi
 
+
+ifeq ($(PYLUCENE_CC),)
+PYLUCENE_CC=$(GCJ_HOME)/bin/gcc
+endif
+
+ifeq ($(PYLUCENE_CXX),)
+PYLUCENE_CXX=$(GCJ_HOME)/bin/g++
+endif
+
+ifeq ($(PYLUCENE_JCC),)
+PYLUCENE_JCC=$(GCJ_HOME)/bin/gcj
+endif
+
+ifeq ($(PYLUCENE_JCCH),)
+PYLUCENE_JCCH=$(GCJ_HOME)/bin/gcjh
+endif
+
 build: apply
 	$(MAKE) -C $(SRC) \
             PREFIX=$(PREFIX) \
             PREFIX_PYTHON=$(PREFIX_PYTHON) \
             SWIG=$(SWIG) \
             GCJ_HOME=$(GCJ_HOME) \
+            CC=$(PYLUCENE_CC) \
+            CXX=$(PYLUCENE_CXX) \
+            JCC=$(PYLUCENE_JCC) \
+            JCCH=$(PYLUCENE_JCCH) \
             DB=$(BUILD_ROOT)/persistence/db/db-4.2.52 \
             PREFIX_DB=$(PREFIX_DB) \
             BUILD_DB=build_$(SNAP) \



More information about the Commits mailing list