2b72bc6e2f
resolve_tilde() function by Christopher Zimmermann (madroach AT zakweb DOT de): thanks! OK landry@
50 lines
1.2 KiB
Plaintext
50 lines
1.2 KiB
Plaintext
$OpenBSD: patch-common_mk,v 1.2 2010/09/14 08:54:18 dcoppa Exp $
|
||
--- common.mk.orig Mon Sep 13 10:28:54 2010
|
||
+++ common.mk Mon Sep 13 10:44:44 2010
|
||
@@ -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-bf1 (2010-06-09)"
|
||
VERSION=3.e-bf1
|
||
|
||
@@ -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
|