so close - all but packaging

diff --git a/macosx/build/Makefile.tiger b/macosx/build/Makefile.tiger
index 9eb3fc0633bf8b6c2b6a56a46f71547e118a2447..66984ace242dbd90d9b7124310cc0e5915fe9ad7 100644 (file)
--- a/macosx/build/Makefile.tiger
+++ b/macosx/build/Makefile.tiger
@@ -19,7 +19,7 @@ ARCHS=$(ARCHS32) $(ARCHS64)
 # base
 
 GV_DIR=../..
-DOT=dot
+DOT=dot_static
 
 #
 # graphviz
@@ -31,7 +31,9 @@ graphviz.pkg: graphviz.pmdoc usr/local/bin/$(DOT) Release/Graphviz.app postinsta
        @echo
        "$(PACKAGEMAKER)" --doc graphviz.pmdoc --out $@
 
-usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/.libs/$(DOT)
+#usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/.libs/$(DOT)
+
+usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/$(DOT)
        @echo
        @echo INSTALLING GRAPHVIZ...
        @echo
@@ -39,19 +41,23 @@ usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/.libs/$(DOT)
        rm -rf usr/local/lib/graphviz/tcl/libtcldot_builtin.*
        cp $(PREFIX)/bin/fc-cache usr/local/bin/gv-fc-cache
        
-Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
+#Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
+
+Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/$(DOT)
        @echo
        @echo BUILDING GRAPHVIZ GUI...
        @echo
        "$(XCODEBUILD)" -project ../graphviz.xcodeproj -configuration Release
 
 postinstall:
-       echo "/usr/local/bin/dot -c" >$@
+       echo "/usr/local/bin/$(DOT) -c" >$@
        make -n -C ../../tclpkg install-data-hook >>$@
        echo "arch $(ARCHS32) /usr/local/bin/gv-fc-cache" >>$@
        echo 'if test `sysctl -n hw.cpu64bit_capable` = 1; then arch $(ARCHS64) /usr/local/bin/gv-fc-cache; fi' >>$@
 
-$(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
+#$(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
+
+$(GV_DIR)/cmd/dot/$(DOT): $(GV_DIR)/Makefile
        @echo
        @echo MAKING GRAPHVIZ...
        @echo
@@ -65,4 +71,4 @@ $(GV_DIR)/Makefile: $(GV_DIR)/configure
        @echo
        @echo CONFIGURING GRAPHVIZ...
        @echo
-       cd $(GV_DIR) && ./configure --disable-shared --enable-static --disable-dependency-tracking --with-ipsepcola --without-quartz CFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" CXXFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" OBJCFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" LDFLAGS="$(ARCHS) -L$(PREFIX)/lib -Wl,-dead_strip" GDLIB_CONFIG="$(PREFIX)/bin/gdlib-config" PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig" LIBS="-framework CoreFoundation -framework CoreServices -framework ApplicationServices"
+       cd $(GV_DIR) && ./configure --disable-shared --enable-static --disable-dependency-tracking --with-ipsepcola --without-quartz CFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" CXXFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" OBJCFLAGS="-O2 $(ARCHS) -I$(PREFIX)/include" LDFLAGS="$(ARCHS) -L$(PREFIX)/lib -Wl,-dead_strip" GDLIB_CONFIG="$(PREFIX)/bin/gdlib-config" PKG_CONFIG="$(PREFIX)/bin/pkg-config" PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig:/usr/X11/lib/pkgconfig" LIBS="-framework CoreFoundation -framework CoreServices -framework ApplicationServices -fexceptions"