blob: c4c6671544ccff514af3bf56a6916704347ede08 (
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.8 2005/08/16 15:35:51 adam Exp $
--- src/Makefile.orig 2005-08-15 22:09:24.000000000 +0000
+++ src/Makefile
@@ -21,8 +21,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) -lX11
+# flags for X11 paths will be supplied by pkgsrc
+X11_INCL = # empty
+X11_LIBS = -lX11
endif
AR = ar
@@ -141,8 +142,10 @@ ifdef BUILD_DIST # distribution build
OPTIONS = -O3 -Wall
endif
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_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) $(EXTRA_CFLAGS) $(CONFIG)
+LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
SRCS = main.c \
|
