1 --- a/keynav-20091108/Makefile 2009-11-08 16:04:23.000000000 -0500
2 +++ b/keynav-20091108/Makefile 2009-11-26 11:44:05.336699998 -0500
4 -CFLAGS=`pkg-config --cflags xcb-shape xinerama x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include`
5 -LDFLAGS=`pkg-config --libs xcb-shape xinerama x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama`
6 +CFLAGS+= $(shell pkg-config --cflags xcb-shape xinerama x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include)
7 +LDFLAGS+= $(shell pkg-config --libs xcb-shape xinerama x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama)
10 OTHERFILES=README CHANGELIST COPYRIGHT \
21 - make -C xdotool clean || true
22 + $(MAKE) -C xdotool clean || true
24 keynav: xdo.o keynav.o
25 - gcc $(LDFLAGS) xdo.o keynav.o -o $@
26 + $(CC) $(CFLAGS) xdo.o keynav.o -o $@ $(LDFLAGS)
29 - make -C xdotool xdo.o
30 + $(MAKE) -C xdotool xdo.o
33 #NAME=keynav-`date +%Y%m%d`.$(MICROVERSION);
34 --- a/keynav-20091108/xdotool/Makefile 2009-11-08 16:01:30.000000000 -0500
35 +++ b/keynav-20091108/xdotool/Makefile 2009-11-26 11:37:19.769691350 -0500
37 DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst
38 DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
40 -LIBS=`pkg-config --libs x11 xtst 2> /dev/null || echo "$(DEFAULT_LIBS)"`
41 -INC=`pkg-config --cflags x11 xtst 2> /dev/null || echo "$(DEFAULT_INC)"`
42 +LIBS=$(shell pkg-config --libs x11 xtst 2> /dev/null || echo "$(DEFAULT_LIBS)")
43 +INC=$(shell pkg-config --cflags x11 xtst 2> /dev/null || echo "$(DEFAULT_INC)")