From 7cd1161aeff36065fa3607b5c5ede6f2d5923249 Mon Sep 17 00:00:00 2001 From: "geortz@gmail.com" Date: Thu, 6 Nov 2014 12:57:39 +0000 Subject: [PATCH] check for existing packages destdir default value git-svn-id: https://callirhoe.googlecode.com/svn/branches/phantome@231 81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df --- Makefile | 5 ++++- scripts/make_pkg | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 00d4eea..635a8d1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DESTDIR=/usr +DESTDIR=/usr/local all: cd scripts && ./make_pkg @@ -11,3 +11,6 @@ install-package: install -m755 callirhoe $(DESTDIR)/bin/callirhoe install -m755 calmagick $(DESTDIR)/bin/calmagick install -m644 holidays/* $(DESTDIR)/share/callirhoe/holidays/ + +clean: + rm -f callirhoe calmagick diff --git a/scripts/make_pkg b/scripts/make_pkg index c62a89a..3e7b5b9 100755 --- a/scripts/make_pkg +++ b/scripts/make_pkg @@ -38,5 +38,5 @@ create_calmagick_package() { set -e cd .. -create_callirhoe_package -create_calmagick_package +[[ -x callirhoe ]] && echo "callirhoe package seems to exist, skipping; rm 'calliroe' to recreate" || create_callirhoe_package +[[ -x calmagick ]] && echo "calmagick package seems to exist, skipping; rm 'calmagick' to recreate" || create_calmagick_package