blob: 27d7cc157e55396a09a3a8e461303fc3b17fa339 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
$NetBSD: patch-ab,v 1.5 2003/08/05 15:12:47 adam Exp $
--- src/Makefile.orig 2003-08-05 01:58:16.000000000 +0200
+++ src/Makefile
@@ -16,8 +16,9 @@ endif
ifdef X11_PATH # path to X11 specified by top level Makefile
XINC_PATH = $(X11_PATH)/include
XLIB_PATH = $(X11_PATH)/lib
-X11_INCL = -I$(XINC_PATH)
-X11_LIBS = -L$(XLIB_PATH)
+# flags for X11 paths will be supplied by pkgsrc
+X11_INCL = # empty
+X11_LIBS = # empty
endif
AR = ar
@@ -119,8 +120,10 @@ ifdef BUILD_DIST # distribution build
OPTIONS = -O3 -Wall
endif
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+# pkgsrc presets those variables, so use '+=' to append to them
+# flags for debugging or optimisation may be supplied from the pkgsrc Makefile
+CFLAGS += $(SYS_CFLAGS) $(CONFIG)
+LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
SRCS = main.c \
|
