From b41e038f2bb56b57d9fe30ed9a176d8322c0e66b Mon Sep 17 00:00:00 2001
From: Julien Kauffmann <julien.kauffmann@freelan.org>
Date: Thu, 16 Apr 2015 17:45:21 -0400
Subject: [PATCH] Updated OSX installer scripts (#30)

---
 packaging/osx/Makefile                  | 8 +++-----
 packaging/osx/org.freelan.freelan.plist | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packaging/osx/Makefile b/packaging/osx/Makefile
index 1a000e28..f1d99a24 100644
--- a/packaging/osx/Makefile
+++ b/packaging/osx/Makefile
@@ -1,6 +1,6 @@
 PRODUCT_NAME=freelan
 IDENTIFIER=org.freelan.freelan
-VERSION=1.1
+VERSION=2.0
 DAEMON_PACKAGE=${IDENTIFIER}.pkg
 FINAL_PACKAGE=${PRODUCT_NAME}_${VERSION}.pkg
 
@@ -13,12 +13,10 @@ clean:
 
 package: clean
 	mkdir -p ${IDENTIFIER}
-	mkdir -p ${IDENTIFIER}/usr/local/sbin
-	mkdir -p ${IDENTIFIER}/usr/local/etc/freelan
+	mkdir -p ${IDENTIFIER}/usr/local
 	mkdir -p ${IDENTIFIER}/usr/local/share/freelan
 	mkdir -p ${IDENTIFIER}/Library/LaunchDaemons
-	cp ../../install/bin/freelan ${IDENTIFIER}/usr/local/sbin/
-	cp ../../freelan/config/freelan.cfg ${IDENTIFIER}/usr/local/etc/freelan/
+	cp -r ../../install/* ${IDENTIFIER}/usr/local/
 	cp org.freelan.freelan.plist ${IDENTIFIER}/Library/LaunchDaemons/
 	cp uninstall.sh ${IDENTIFIER}/usr/local/share/freelan/
 	pkgbuild --root ${IDENTIFIER} --identifier ${IDENTIFIER} --version ${VERSION} --ownership recommended --scripts scripts ${DAEMON_PACKAGE}
diff --git a/packaging/osx/org.freelan.freelan.plist b/packaging/osx/org.freelan.freelan.plist
index e092df31..f144a751 100644
--- a/packaging/osx/org.freelan.freelan.plist
+++ b/packaging/osx/org.freelan.freelan.plist
@@ -6,7 +6,7 @@
   <string>org.freelan.freelan</string>
   <key>ProgramArguments</key>
   <array>
-    <string>/usr/local/sbin/freelan</string>
+    <string>/usr/local/bin/freelan</string>
     <string>-c</string>
     <string>/usr/local/etc/freelan/freelan.cfg</string>
     <string>-f</string>