X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=config.mk;h=5059632c0da6d75b134cca69253cc77750fbf37c;hb=16d98738e74f189b3a00c23390ab5a9a22b056a1;hp=c7355f1507c8b30d0ee08066322f3b51d7928c11;hpb=30ce2cc002585409b36c630512c6ca4db8f88f15;p=st.git diff --git a/config.mk b/config.mk index c7355f1..5059632 100644 --- a/config.mk +++ b/config.mk @@ -10,17 +10,19 @@ 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` + `$(PKG_CONFIG) --cflags fontconfig` \ + `$(PKG_CONFIG) --cflags freetype2` LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ - `pkg-config --libs fontconfig` \ - `pkg-config --libs freetype2` + `$(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: @@ -31,4 +33,3 @@ STLDFLAGS = $(LIBS) $(LDFLAGS) # compiler and linker # CC = c99 -