binary build fixes: make always triggered, install wrong destination, configure missi...

diff --git a/macosx/build/Makefile.in b/macosx/build/Makefile.in
index 2db567e394939d9fef482aac61ee80607a9a5d16..2af0e6104284a33d26bcb367e748295ba98f6e61 100644 (file)
--- a/macosx/build/Makefile.in
+++ b/macosx/build/Makefile.in
@@ -12,6 +12,7 @@ LOCAL_LIB=$(LOCAL)/lib
 # base
 
 GV_DIR=../..
+GVC=libgvc.la
 
 #
 # graphviz
@@ -27,7 +28,7 @@ usr/local/lib/$(GVC): $(GV_DIR)/lib/gvc/$(GVC)
        @echo
        @echo INSTALLING GRAPHVIZ...
        @echo
-       $(MAKE) DESTDIR=$(PWD)/$(BUILD_DIR) -C $(GV_DIR) install-strip
+       $(MAKE) DESTDIR=$(CURDIR) -C $(GV_DIR) install-strip
        
 Release/Graphviz.app: $(GV_DIR)/lib/gvc/$(GVC)
        @echo
@@ -49,6 +50,6 @@ $(GV_DIR)/Makefile: $(GV_DIR)/configure
        @echo
        @echo CONFIGURING GRAPHVIZ...
        @echo
-       cd $(GV_DIR) && ./configure --disable-dependency-tracking --enable-ltdl-install=yes --with-ipsepcola --with-quartz CFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64 -lpixman-1" PKG_CONFIG_PATH="/usr/X11/lib/pkgconfig"
+       cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz CFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64" CXXFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -arch x86_64" PKG_CONFIG_PATH="/usr/X11/lib/pkgconfig"
 
 

diff --git a/macosx/prebuild/Makefile b/macosx/prebuild/Makefile
index 796881fc0df22fb643df3ec52d4ce527e3c8948b..39da571cd9132648fc19a6017bb37ef2cecf61f6 100644 (file)
--- a/macosx/prebuild/Makefile
+++ b/macosx/prebuild/Makefile
@@ -31,14 +31,14 @@ GLIB=libglib-2.0.la
 PANGO=libpango-1.0.la
 
 # directories
-
-PKGCONFIG_DIR=$(basename $(basename $(notdir $(PKGCONFIG_URL))))
-GD_DIR=$(basename $(basename $(notdir $(GD_URL))))
-PIXMAN_DIR=$(basename $(basename $(notdir $(PIXMAN_URL))))
-CAIRO_DIR=$(basename $(basename $(notdir $(CAIRO_URL))))
-GETTEXT_DIR=$(basename $(basename $(notdir $(GETTEXT_URL))))
-GLIB_DIR=$(basename $(basename $(notdir $(GLIB_URL))))
-PANGO_DIR=$(basename $(basename $(notdir $(PANGO_URL))))
+dirname=$(basename $(basename $(notdir $(1))))
+PKGCONFIG_DIR=$(call dirname, $(PKGCONFIG_URL))
+GD_DIR=$(call dirname, $(GD_URL))
+PIXMAN_DIR=$(call dirname, $(PIXMAN_URL))
+CAIRO_DIR=$(call dirname, $(CAIRO_URL))
+GETTEXT_DIR=$(call dirname, $(GETTEXT_URL))
+GLIB_DIR=$(call dirname, $(GLIB_URL))
+PANGO_DIR=$(call dirname, $(PANGO_URL))
 
 #
 # target

diff --git a/macosx/prebuild/cairo.patch b/macosx/prebuild/cairo.patch
index d99294620b3a210a3ed6d91bac733a437e78f747..9bb48d8bc6992ece95c175d5dcc062e61465b277 100644 (file)
--- a/macosx/prebuild/cairo.patch
+++ b/macosx/prebuild/cairo.patch
@@ -29,3 +29,14 @@ diff -ru cairo-1.6.4/src/cairo-quartz.h cairo-1.6.4.patched/src/cairo-quartz.h
  
  #endif /* CAIRO_HAS_QUARTZ_FONT */
  
+diff -ru cairo-1.6.4/src/cairo.pc.in cairo-1.6.4.patched/src/cairo.pc.in
+--- cairo-1.6.4/src/cairo.pc.in        2007-04-28 01:02:34.000000000 +0800
++++ cairo-1.6.4.patched/src/cairo.pc.in        2008-05-03 18:37:16.000000000 +0800
+@@ -8,6 +8,6 @@
+ Version: @VERSION@
+ 
+ @PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
+-Libs: -L${libdir} -lcairo
++Libs: -L${libdir} -lcairo -lpixman-1
+ Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
+ Cflags: -I${includedir}/cairo