Fix overtyping wide characters.

[st.git] / config.mk

diff --git a/config.mk b/config.mk
index abf25c1..c070a4a 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,28 +1,35 @@
 # st version
 # st version

-VERSION = 0.3
+VERSION = 0.8.4

 
 # Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
 
 # Customize below to fit your system
 
 # paths
 PREFIX = /usr/local

-MANPREFIX = ${PREFIX}/share/man
+MANPREFIX = $(PREFIX)/share/man

 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 

+PKG_CONFIG = pkg-config
+

 # includes and libs
 # includes and libs

-INCS = -I. -I/usr/include -I${X11INC} \
-       $(shell pkg-config --cflags fontconfig) \
-       $(shell pkg-config --cflags freetype2)
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
-       $(shell pkg-config --libs fontconfig)  \
-       $(shell pkg-config --libs freetype2)
+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`

 
 # flags
 
 # flags

-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
-CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -g ${LIBS}
+STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
+STLDFLAGS = $(LIBS) $(LDFLAGS)

 
 

-# compiler and linker
-CC ?= cc
+# 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