]> granicus.if.org Git - graphviz/commitdiff
added symlinks for scripting languages to Mac OS X binary build
authorglenlow <devnull@localhost>
Sat, 17 May 2008 16:32:16 +0000 (16:32 +0000)
committerglenlow <devnull@localhost>
Sat, 17 May 2008 16:32:16 +0000 (16:32 +0000)
macosx/build/Makefile
macosx/postinstall [deleted file]

index cf687a40aef9383ac3133057b7de19eb3c97e7dc..f5fe9f9c898434908809126541c0eced1e7d9ae9 100644 (file)
@@ -21,7 +21,7 @@ DOT=dot
 # graphviz
 #
 
-graphviz.pkg: usr/local/bin/$(DOT) Release/Graphviz.app
+graphviz.pkg: usr/local/bin/$(DOT) Release/Graphviz.app postinstall
        @echo
        @echo PACKAGING GRAPHVIZ...
        @echo
@@ -31,7 +31,7 @@ usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/.libs/$(DOT)
        @echo
        @echo INSTALLING GRAPHVIZ...
        @echo
-       $(MAKE) DESTDIR=$(CURDIR) -C $(GV_DIR) install-strip && \
+       $(MAKE) DESTDIR=$(CURDIR) -C $(GV_DIR) install-strip
        rm -rf usr/local/lib/graphviz/tcl/libtcldot_builtin.*
        
 Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
@@ -40,14 +40,18 @@ Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
        @echo
        "$(XCODEBUILD)" -project ../graphviz.xcodeproj -configuration Release
 
+postinstall:
+       echo "/usr/local/bin/dot -c" >$@
+       make -n -C ../../tclpkg install-data-hook >>$@
+
 $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
        @echo
        @echo MAKING GRAPHVIZ...
        @echo
-       if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi && \
-       $(MAKE) -C $(GV_DIR)/tclpkg/tkstubs && \
-       $(MAKE) -C $(GV_DIR)/tclpkg/tclstubs && \
-       $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 -arch ppc -arch i386 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -L$(LOCAL_LIB) -Wl,-dead_strip -Wl,-dead_strip_dylibs" && \
+       if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi
+       $(MAKE) -C $(GV_DIR)/tclpkg/tkstubs
+       $(MAKE) -C $(GV_DIR)/tclpkg/tclstubs
+       $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 -arch ppc -arch i386 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -L$(LOCAL_LIB) -Wl,-dead_strip -Wl,-dead_strip_dylibs"
        $(MAKE) -C $(GV_DIR)
        
 $(GV_DIR)/Makefile: $(GV_DIR)/configure
diff --git a/macosx/postinstall b/macosx/postinstall
deleted file mode 100755 (executable)
index 794393b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# PackageMaker post install script
-
-$2/bin/dot -c