Title: [commits] (bear) [16000] Putting back the site-packages location as the plugins dir
Revision
16000
Author
bear
Date
2007-11-30 17:34:16 -0800 (Fri, 30 Nov 2007)

Log Message

Putting back the site-packages location as the plugins dir
is looking to require a bit more tweaking

Modified Paths

Diff

Modified: branches/0.7.3/chandler/Makefile (15999 => 16000)

--- branches/0.7.3/chandler/Makefile	2007-12-01 01:09:08 UTC (rev 15999)
+++ branches/0.7.3/chandler/Makefile	2007-12-01 01:34:16 UTC (rev 16000)
@@ -13,6 +13,7 @@
 PYTHON_VER   = 2.5
 BP           =
 LOCALE_VER   = branches/0.7.3
+LOCALE_INST  = 
 
 BUILD_PLUGINS = Chandler-HelloWorldPlugin \
                 Chandler-AmazonPlugin \
@@ -285,6 +286,19 @@
           --script-dir='$(PLUGIN_INST)' \
           --install-dir='$(PLUGIN_INST)' .
 
+
+ifeq ($(OS),Darwin)
+    ifeq ($(OS_MAJOR_VER),9)
+        LOCALE_INST = --install-dir=$(C_BIN)/$(SNAP)/site-packages
+    endif
+endif
+
+ifeq ($(OS),Linux)
+    ifneq ($(findstring $(DISTRIB_CODENAME),feisty gutsy),)
+        LOCALE_INST = --install-dir=$(C_BIN)/$(SNAP)/site-packages
+    endif
+endif
+
 $(addprefix install-, $(BUILD_LOCALES)):
 	rm -rf $(C_HOME)/localizations/$(subst install-,,$@)
 	svn export http://svn.osafoundation.org/localizations/chandler/$(LOCALE_VER)/$(subst install-,,$@) $(C_HOME)/localizations/$(subst install-,,$@)
@@ -292,8 +306,7 @@
                   -l $(subst install-,,$@) \
                   -f '$(LOCALE_SRC)'$(subst install-,,$@)/Chandler-$(subst install-,,$@).po \
                   -d '$(LOCALE_SRC)'
-	$(RUN_PYTHON) -m easy_install -x --multi-version --install-dir='$(PLUGIN_INST)' \
-                      '$(LOCALE_SRC)'Chandler.$(subst install-,,$@)-1.0-py$(PYTHON_VER).egg
+	$(RUN_PYTHON) -m easy_install -x $(LOCALE_INST) '$(LOCALE_SRC)'Chandler.$(subst install-,,$@)-1.0-py$(PYTHON_VER).egg
 
 chandler-locale-data:
 	$(RUN_PYTHON) setup.py egg_info




_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits

Reply via email to