diff options
| author | rjl6789 <rob.livesey@gmail.com> | 2019-05-09 07:37:21 +0100 |
|---|---|---|
| committer | rjl6789 <rob.livesey@gmail.com> | 2019-05-09 07:37:21 +0100 |
| commit | 9aa7f38187cf6ff15ec1a11fc83e8d43e1b1a6d5 (patch) | |
| tree | 79889ddefc19e3ea2fc1c2374d9a54727e156435 /config.mk | |
| parent | e99aa29eefb43c1ea9f63c13d35bf45f7a90171b (diff) | |
| parent | da13ef12463d1870caed94584db464d68c6b3182 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config.mk')
| -rw-r--r-- | config.mk | 27 |
1 files changed, 17 insertions, 10 deletions
@@ -1,28 +1,35 @@ # st version -VERSION = 0.8.1 +VERSION = 0.8.2 # Customize below to fit your system # paths -PREFIX = /usr/local +PREFIX ?= /usr/local MANPREFIX = $(PREFIX)/share/man X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib +PKG_CONFIG = pkg-config + # includes and libs INCS = -I$(X11INC) \ - `pkg-config --cflags fontconfig` \ - `pkg-config --cflags freetype2` -LIBS = -L${X11LIB} -lm -lrt -lX11 -lutil -lXft -lXrender \ - `pkg-config --libs fontconfig` \ - `pkg-config --libs freetype2` + `$(PKG_CONFIG) --cflags fontconfig` \ + `$(PKG_CONFIG) --cflags freetype2` +LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender \ + `$(PKG_CONFIG) --libs fontconfig` \ + `$(PKG_CONFIG) --libs freetype2` # flags -CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) +STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 +STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) STLDFLAGS = $(LIBS) $(LDFLAGS) +# OpenBSD: +#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE +#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \ +# `pkg-config --libs fontconfig` \ +# `pkg-config --libs freetype2` + # compiler and linker # CC = c99 - |