diff --git a/config.mk b/config.mk index 3731589..8c32776 100644 --- a/config.mk +++ b/config.mk @@ -8,6 +8,10 @@ ifeq ($(OS),Linux) PREFIX = /usr MANPREFIX = $(PREFIX)/share/man endif +ifeq ($(OS),FreeBSD) +PREFIX = /usr/local +MANPREFIX = $(PREFIX)/share/man +endif ifeq ($(OS),OpenBSD) PREFIX = /usr/local MANPREFIX = $(PREFIX)/man @@ -15,6 +19,10 @@ endif X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib +ifeq ($(OS),FreeBSD) +X11INC = ${PREFIX}/include +X11LIB = ${PREFIX}/lib +endif # Xinerama, comment if you don't want it XINERAMALIBS = -lXinerama @@ -22,9 +30,7 @@ XINERAMAFLAGS = -DXINERAMA # freetype FREETYPELIBS = -lfontconfig -lXft -ifeq ($(OS),Linux) -FREETYPEINC = /usr/include/freetype2 -endif +FREETYPEINC = ${PREFIX}/include/freetype2 ifeq ($(OS),OpenBSD) FREETYPEINC = $(X11INC)/freetype2 endif diff --git a/dmenu.c b/dmenu.c index 627f6cf..4a149f8 100644 --- a/dmenu.c +++ b/dmenu.c @@ -156,7 +156,7 @@ drawitem(struct item *item, int x, int y, int w) } static void -recalculatenumbers() +recalculatenumbers(void) { unsigned int numer = 0, denom = 0; struct item *item;