[commits] (bear) [11327] the fix for bug 6438 requires a change that does not work the same on windows and linux/os x

[commits]

Title: [commits] (bear) [11327] the fix for bug 6438 requires a change that does not work the same on windows and linux/os x

Revision

11327

Author

bear

Date

2006-08-04 12:37:23 -0700 (Fri, 04 Aug 2006)

Log Message

the fix for bug 6438 requires a change that does not work the same on windows and linux/os x
the good thing is that this now makes the three projects install the same

Modified Paths

• trunk/external/parsedatetime/Makefile
• trunk/external/vobject/Makefile
• trunk/external/zanshin/Makefile

Diff

Modified: trunk/external/parsedatetime/Makefile (11326 => 11327)

--- trunk/external/parsedatetime/Makefile	2006-08-04 18:53:23 UTC (rev 11326)
+++ trunk/external/parsedatetime/Makefile	2006-08-04 19:37:23 UTC (rev 11327)
@@ -9,11 +9,19 @@
 
 BUILD=build_$(SNAP)
 
+ifeq ($(OS),Cygwin)
 build: expand
 	cd $(SRC); \
         MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
         build --build-base=$(BUILD) $(DIST_OPT) \
+        install_lib --force --install-dir=`cygpath -aw $(BUILD_ROOT)/$(SNAP)/$(SITE)`
+else
+build: expand
+	cd $(SRC); \
+        MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
+        build --build-base=$(BUILD) $(DIST_OPT) \
         install_lib --force --install-dir=$(BUILD_ROOT)/$(SNAP)/$(SITE)
+endif
 
 parsedatetime-$(VERSION).tar.gz:
 	$(CURL) http://builds.osafoundation.org/external/parsedatetime-$(VERSION).tar.gz

Modified: trunk/external/vobject/Makefile (11326 => 11327)

--- trunk/external/vobject/Makefile	2006-08-04 18:53:23 UTC (rev 11326)
+++ trunk/external/vobject/Makefile	2006-08-04 19:37:23 UTC (rev 11327)
@@ -30,11 +30,19 @@
             patch -Nup0 < patches-$(VERSION);echo ok; \
         fi
 
+ifeq ($(OS),Cygwin)
 build: expand apply
 	cd $(SRC); \
     MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
         build --build-base=$(BUILD) $(DIST_OPT) \
-        install --force --install-lib=$(BUILD_ROOT)/$(SNAP)/$(SITE)
+        install_lib --force --install-dir=`cygpath -aw $(BUILD_ROOT)/$(SNAP)/$(SITE)`
+else
+build: expand apply
+	cd $(SRC); \
+    MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
+        build --build-base=$(BUILD) $(DIST_OPT) \
+        install_lib --force --install-dir=$(BUILD_ROOT)/$(SNAP)/$(SITE)
+endif
 
 binaries: strip
 	tar -C $(BUILD_ROOT) -cvzf $(VOBJECT)/$(TARBALL) \

Modified: trunk/external/zanshin/Makefile (11326 => 11327)

--- trunk/external/zanshin/Makefile	2006-08-04 18:53:23 UTC (rev 11326)
+++ trunk/external/zanshin/Makefile	2006-08-04 19:37:23 UTC (rev 11327)
@@ -9,11 +9,19 @@
 
 include $(BUILD_ROOT)/Makefile.inc
 
+ifeq ($(OS),Cygwin)
 build: expand
 	cd $(SRC); \
       MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
           build --build-base=$(BUILD) $(DIST_OPT) \
+          install_lib --force --install-dir=`cygpath -aw $(BUILD_ROOT)/$(SNAP)/$(SITE)`
+else
+build: expand
+	cd $(SRC); \
+      MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
+          build --build-base=$(BUILD) $(DIST_OPT) \
           install_lib --force --install-dir=$(BUILD_ROOT)/$(SNAP)/$(SITE)
+endif
 
 zanshin-$(VERSION).tar.gz:
 	svn export http://svn.osafoundation.org/zanshin/trunk -r $(VERSION) zanshin-$(VERSION)

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits