build cleanup: quote commands that may contain spaces, target dot executable instead...

diff --git a/macosx/build/Makefile b/macosx/build/Makefile
index dc58af32aaa66630a7b104fb769d3bf1090a4d4b..cf687a40aef9383ac3133057b7de19eb3c97e7dc 100644 (file)
--- a/macosx/build/Makefile
+++ b/macosx/build/Makefile
@@ -15,32 +15,32 @@ LOCAL_LIB=$(LOCAL)/lib
 # base
 
 GV_DIR=../..
-GVC=libgvc.la
+DOT=dot
 
 #
 # graphviz
 #
 
-graphviz.pkg: usr/local/lib/$(GVC) Release/Graphviz.app
+graphviz.pkg: usr/local/bin/$(DOT) Release/Graphviz.app
        @echo
        @echo PACKAGING GRAPHVIZ...
        @echo
-       $(PACKAGEMAKER) --doc ../graphviz.pmdoc --out $@
+       "$(PACKAGEMAKER)" --doc ../graphviz.pmdoc --out $@
 
-usr/local/lib/$(GVC): $(GV_DIR)/lib/gvc/$(GVC)
+usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/.libs/$(DOT)
        @echo
        @echo INSTALLING GRAPHVIZ...
        @echo
        $(MAKE) DESTDIR=$(CURDIR) -C $(GV_DIR) install-strip && \
        rm -rf usr/local/lib/graphviz/tcl/libtcldot_builtin.*
        
-Release/Graphviz.app: $(GV_DIR)/lib/gvc/$(GVC)
+Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
        @echo
        @echo BUILDING GRAPHVIZ GUI...
        @echo
-       $(XCODEBUILD) -project ../graphviz.xcodeproj -configuration Release
+       "$(XCODEBUILD)" -project ../graphviz.xcodeproj -configuration Release
 
-$(GV_DIR)/lib/gvc/$(GVC): $(GV_DIR)/Makefile
+$(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
        @echo
        @echo MAKING GRAPHVIZ...
        @echo
@@ -54,4 +54,4 @@ $(GV_DIR)/Makefile: $(GV_DIR)/configure
        @echo
        @echo CONFIGURING GRAPHVIZ...
        @echo
-       cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" CXXFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -L$(LOCAL_LIB) -Wl,-dead_strip -Wl,-dead_strip_dylibs" PKG_CONFIG="$(LOCAL_BIN)/pkg-config" PKG_CONFIG_PATH="/usr/X11/lib/pkgconfig"
+       cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" CXXFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -L$(LOCAL_LIB) -Wl,-dead_strip -Wl,-dead_strip_dylibs" GDLIB_CONFIG="$(LOCAL_BIN)/gdlib-config" PKG_CONFIG="$(LOCAL_BIN)/pkg-config" PKG_CONFIG_PATH="/usr/X11/lib/pkgconfig"