From 97dd8d864f0172fdba055f8d868079eec7a36933 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 2 Jun 2015 11:59:05 -0700 Subject: [PATCH] Fix paths again in Mac pkg build. --- ext/installfiles/mac/ZeroTier One.pkgproj | 42 +++++++++++------------ make-mac.mk | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 80cdac609..556568e3c 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -37,9 +37,9 @@ GID 80 PATH - ../../../ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app + ../../mac-ui-macgap1-wrapper/bin/ZeroTier One.app PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -79,9 +79,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/get-proxy-settings.sh + get-proxy-settings.sh PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -95,9 +95,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/launch.sh + launch.sh PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -111,9 +111,9 @@ GID 0 PATH - ../../../ext/bin/tap-mac/tap.kext + ../../bin/tap-mac/tap.kext PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -132,7 +132,7 @@ PATH ../../../ui/index.html PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -148,7 +148,7 @@ PATH ../../../ui/main.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -164,7 +164,7 @@ PATH ../../../ui/react.min.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -180,7 +180,7 @@ PATH ../../../ui/simpleajax.min.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -196,7 +196,7 @@ PATH ../../../ui/zerotier.css PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -212,7 +212,7 @@ PATH ../../../ui/ztui.min.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -240,9 +240,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/uninstall.sh + uninstall.sh PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -258,7 +258,7 @@ PATH ../../../zerotier-one PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -429,9 +429,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/com.zerotier.one.plist + com.zerotier.one.plist PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -734,14 +734,14 @@ POSTINSTALL_PATH PATH - ../../../ext/installfiles/mac/postinst.sh + /Users/api/Code/ZeroTierOne/ext/installfiles/mac/postinst.sh PATH_TYPE 0 PREINSTALL_PATH PATH - ../../../ext/installfiles/mac/preinst.sh + /Users/api/Code/ZeroTierOne/ext/installfiles/mac/preinst.sh PATH_TYPE 0 diff --git a/make-mac.mk b/make-mac.mk index 48bfdd790..3bb0727a8 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -62,7 +62,7 @@ selftest: $(OBJS) selftest.o # Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html mac-dist-pkg: FORCE - cd ext/installfiles/mac ; packagesbuild "ZeroTier One.pkgproj" + packagesbuild "ext/installfiles/mac/ZeroTier One.pkgproj" $(CODESIGN) -f -s $(CODESIGN_CERT) "ZeroTier One.pkg" $(CODESIGN) -vvv "ZeroTier One.pkg"