From b50ae0a592a147999c8dea93999919dc42c181cf Mon Sep 17 00:00:00 2001
From: "ph4ntome@gmail.com"
 <ph4ntome@gmail.com@81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df>
Date: Thu, 6 Nov 2014 11:45:50 +0000
Subject: [PATCH] Changes in scripts (added Makefile), changed make_pkg

git-svn-id: https://callirhoe.googlecode.com/svn/branches/phantome@223 81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df
---
 scripts/Makefile | 10 ++++++++++
 scripts/make_pkg | 16 +++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 scripts/Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
new file mode 100644
index 0000000..d5656fa
--- /dev/null
+++ b/scripts/Makefile
@@ -0,0 +1,10 @@
+DESTDIR=/usr
+
+install: install-package
+
+install-package:
+	mkdir -p $(DESTDIR)/bin
+	mkdir -p $(DESTDIR)/share/callirhoe/holidays
+	install -m755 callirhoe $(DESTDIR)/bin/callirhoe
+	install -m755 calmagick $(DESTDIR)/bin/calmagick
+	install -m644 holidays/* $(DESTDIR)/share/callirhoe/holidays/
diff --git a/scripts/make_pkg b/scripts/make_pkg
index 3b8e549..77a3368 100755
--- a/scripts/make_pkg
+++ b/scripts/make_pkg
@@ -31,24 +31,14 @@ create_calmagick_package() {
     DIR=`mktemp -d -t callirhoe.XXX`
     tar c lib/{__init__,geom}.py | tar x -C "$DIR"
     cp calmagick.py "$DIR/__main__.py"
-    
+
     make_python_zip calmagick "$DIR"
 }
 
-create_makefile() {
-    cat << END > Makefile
-install:
-	install -Dm755 callirhoe \$(DESTDIR)/bin/callirhoe
-	install -Dm755 calmagick \$(DESTDIR)/bin/calmagick
-END
-
-    find holidays/* -printf "\tinstall -Dm644 %p \$(DESTDIR)/share/callirhoe/%p\n" >> Makefile
-}
-
 set -e
+
+cp Makefile ../
 cd ..
 
 create_callirhoe_package
 create_calmagick_package
-
-[[ "`uname`" != "Darwin" ]] && create_makefile