--- xfree86-driver-synaptics-0.14.7~git20070706.orig/Makefile +++ xfree86-driver-synaptics-0.14.7~git20070706/Makefile @@ -9,10 +9,10 @@ PREFIX ?= /usr/local BINDIR = $(DESTDIR)$(PREFIX)/bin -MANDIR = $(DESTDIR)$(PREFIX)/man +MANDIR = $(DESTDIR)$(PREFIX)/share/man ifeq ($(ARCH),) - ARCH = $(shell /bin/arch) + ARCH = $(shell /bin/uname -m) endif ifeq ($(ARCH),amd64) ARCH = x86_64 @@ -34,10 +34,7 @@ LDCOMBINEFLAGS = -shared -lc PICFLAG = $(call check_gcc,-fPIC,) X_INCLUDES_ROOT = $(INSTALLED_X) - SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir) - ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \ - -I$(INSTALLED_X)/include/X11/extensions \ - -I$(SDKDIR) + ALLINCLUDES = $(shell pkg-config --cflags xorg-server pixman-1) else INSTALLED_X = /usr/X11R6 INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input