X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=config.mk;h=3cab3357c75b07c0036c34f3b6a50fa158c9cdb0;hp=f1757edf5b89057713b7ddf8a7aa8207b03b3803;hb=d945d7093d1822bf249e2e38ce97e5b37f695fdb;hpb=7474a2fc3785eb1aad00f8cf2b50711bbe1fff0b

diff --git a/config.mk b/config.mk
index f1757ed..3cab335 100644
--- a/config.mk
+++ b/config.mk
@@ -1,24 +1,28 @@
 # st version
-VERSION = 0.3
+VERSION = 0.5
 
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
+PREFIX = /home/jasonwoof/local/st
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # includes and libs
-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
+INCS = -I. -I/usr/include -I${X11INC} \
+       `pkg-config --cflags fontconfig` \
+       `pkg-config --cflags freetype2`
+LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \
+       `pkg-config --libs fontconfig`  \
+       `pkg-config --libs freetype2`
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600
+CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS}
 LDFLAGS += -g ${LIBS}
 
 # compiler and linker
-CC ?= cc
+# CC = cc