29 lines
887 B
Plaintext
29 lines
887 B
Plaintext
$OpenBSD: patch-config_mk,v 1.10 2018/03/17 13:28:39 kn Exp $
|
|
Index: config.mk
|
|
--- config.mk.orig
|
|
+++ config.mk
|
|
@@ -11,17 +11,14 @@ X11INC = /usr/X11R6/include
|
|
X11LIB = /usr/X11R6/lib
|
|
|
|
# includes and libs
|
|
-INCS = -I$(X11INC) \
|
|
- `pkg-config --cflags fontconfig` \
|
|
- `pkg-config --cflags freetype2`
|
|
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
|
- `pkg-config --libs fontconfig` \
|
|
- `pkg-config --libs freetype2`
|
|
+INCS != pkg-config --cflags fontconfig
|
|
+LIBS = -lm -lX11 -lutil -lXft
|
|
+LIBS +!= pkg-config --libs fontconfig
|
|
|
|
# flags
|
|
-CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
|
-STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
|
|
-STLDFLAGS = $(LIBS) $(LDFLAGS)
|
|
+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
|
|
+STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS} ${CFLAGS}
|
|
+STLDFLAGS += ${LIBS} ${LDFLAGS}
|
|
|
|
# compiler and linker
|
|
# CC = c99
|