only run gv-fc-cache in 64-bit mode on a 64-bit capable machine

diff --git a/macosx/build/Makefile b/macosx/build/Makefile
index 67e3963b58fc60f7f07e3072c416e257146f0e9e..9a0f706cbad2e03a5be38241419bef54f34e22c9 100644 (file)
--- a/macosx/build/Makefile
+++ b/macosx/build/Makefile
@@ -29,8 +29,7 @@ usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/.libs/$(DOT)
        @echo
        $(MAKE) DESTDIR=$(CURDIR) -C $(GV_DIR) install-strip
        rm -rf usr/local/lib/graphviz/tcl/libtcldot_builtin.*
-       ditto $(PREFIX)/bin/fc-cache -arch ppc -arch i386 usr/local/bin/gv-fc-cache-32
-       ditto $(PREFIX)/bin/fc-cache -arch ppc64 -arch x86_64 usr/local/bin/gv-fc-cache-64
+       cp $(PREFIX)/bin/fc-cache usr/local/bin/gv-fc-cache
        
 Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
        @echo
@@ -41,8 +40,8 @@ Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
 postinstall:
        echo "/usr/local/bin/dot -c" >$@
        make -n -C ../../tclpkg install-data-hook >>$@
-       echo "/usr/local/bin/gv-fc-cache-32" >>$@
-       echo "/usr/local/bin/gv-fc-cache-64" >>$@
+       echo "arch -arch i386 -arch ppc /usr/local/bin/gv-fc-cache" >>$@
+       echo "if [ `sysctl -n hw.cpu64bit_capable` = "1" ]; then arch -arch x86_64 -arch ppc64 /usr/local/bin/gv-fc-cache; fi" >>$@
 
 $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
        @echo