--- Makefile.orig	2013-06-30 18:47:46.000000000 +0200
+++ Makefile	2013-07-02 13:13:04.000000000 +0200
@@ -5,7 +5,7 @@
 VERSION=3.1.1
 
 CC=gcc
-CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
+CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE $(EXTRACFLAGS)
 INSTALL=install
 PKGCONFIG=pkg-config
 XML2CONFIG=xml2-config
@@ -13,7 +13,7 @@
 
 # these locations seem to work for SuSE and Fedora
 # prefix = $(HOME)
-prefix = $(DESTDIR)/usr
+#prefix = $(DESTDIR)/usr
 BINDIR = $(prefix)/bin
 DATADIR = $(prefix)/share
 DESKTOPDIR = $(DATADIR)/applications
@@ -81,8 +81,8 @@
 	LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
 	LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
 else
-libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
-libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
+libdc-local := $(wildcard $(prefix)/lib/libdivecomputer.a)
+libdc-local64 := $(wildcard $prefix)/lib64/libdivecomputer.a)
 libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
 libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
 
@@ -154,7 +154,7 @@
 else ifeq ($(UNAME), darwin)
 	OSSUPPORT = macos
 	OSSUPPORT_CFLAGS = $(GTKCFLAGS)
-	MACOSXINSTALL = /Applications/$(CAPITALIZED_NAME).app
+	MACOSXINSTALL = ${mpappdir}/$(CAPITALIZED_NAME).app
 	MACOSXFILES = packaging/macosx
 	MACOSXSTAGING = $(MACOSXFILES)/$(CAPITALIZED_NAME).app
 	INFOPLIST = $(MACOSXFILES)/Info.plist