openbsd-ports/x11/i3/patches/patch-common_mk

$OpenBSD: patch-common_mk,v 1.3 2011/03/14 12:55:18 dcoppa Exp $
--- common.mk.orig	Wed Jan 19 21:26:43 2011
+++ common.mk	Mon Mar 14 13:39:50 2011
@@ -1,12 +1,12 @@
 UNAME=$(shell uname)
 DEBUG=1
 INSTALL=install
-PREFIX=/usr
-ifeq ($(PREFIX),/usr)
-SYSCONFDIR=/etc
-else
-SYSCONFDIR=$(PREFIX)/etc
+ifndef PREFIX
+  PREFIX=/usr
 endif
+ifndef SYSCONFDIR
+  SYSCONFDIR=/etc
+endif
 GIT_VERSION="3.e-bf2 (2011-01-19)"
 VERSION=3.e-bf2
 
@@ -17,7 +17,7 @@ CFLAGS += -Wall
 # We don’t want unused-parameter because of the use of many callbacks
 CFLAGS += -Wunused-value
 CFLAGS += -Iinclude
-CFLAGS += -I/usr/local/include
+CFLAGS += -I${LOCALBASE}/include
 CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
 
 # Check if pkg-config is installed, because without pkg-config, the following
@@ -49,7 +49,7 @@ LDFLAGS += -lxcb
 LDFLAGS += -lyajl
 LDFLAGS += -lX11
 LDFLAGS += -lev
-LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
+LDFLAGS += -L${LOCALBASE}/lib -L/usr/pkg/lib
 
 ifeq ($(UNAME),NetBSD)
 # We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
@@ -78,9 +78,6 @@ CFLAGS += -g3
 else
 CFLAGS += -O2
 endif
-
-# Don’t print command lines which are run
-.SILENT:
 
 # Always remake the following targets
 .PHONY: install clean dist distclean