--- Makefile.orig	Sun Jul 16 00:58:26 2006
+++ Makefile	Sun Aug 13 10:47:35 2006
@@ -12,14 +12,14 @@
 MANDIR = $(DESTDIR)$(PREFIX)/man
 
 ifeq ($(ARCH),)
-  ARCH = $(shell /bin/arch)
+  ARCH = $(shell uname -m)
 endif
 ifeq ($(ARCH),amd64)
-  ARCH = x86_64
+  override ARCH = x86_64
 endif
 ifeq ($(ARCH),x86_64)
   ARCH_DEFINES = -D__x86_64__ -D_XSERVER64
-  LIBDIR = lib64
+  LIBDIR = lib
 else
   ARCH_DEFINES = -D__i386__
   LIBDIR = lib
@@ -39,7 +39,7 @@
 		-I$(INSTALLED_X)/include/X11/extensions \
 		-I$(SDKDIR)
 else
-  INSTALLED_X = /usr/X11R6
+  INSTALLED_X = ${X11BASE}
   INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
   SYNAPTICS_DRV = synaptics_drv.o
   LDCOMBINEFLAGS = -r
@@ -62,12 +62,16 @@
   else
     SERVERSRC = $(TOP)/programs/Xserver
     ALLINCLUDES = -I. \
+	-I${X11BASE}/include \
+	-I${X11BASE}/include/X11 \
+	-I$(SERVERSRC)/hw/xfree86 \
 	-I$(SERVERSRC)/hw/xfree86/common \
 	-I$(SERVERSRC)/hw/xfree86/os-support \
+	-I$(SERVERSRC)/hw/xfree86/os-support/bus \
 	-I$(SERVERSRC)/mi \
 	-I$(SERVERSRC)/include \
 	-I$(TOP)/include
-    X_INCLUDES_ROOT = $(TOP)
+    X_INCLUDES_ROOT = $(X11BASE)
   endif
 endif
 
@@ -81,11 +85,11 @@
 
 CCOPTIONS := -pedantic -Wall -Wpointer-arith
 CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
-CDEBUGFLAGS = -O2
-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
-CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
+#CDEBUGFLAGS = -O2
+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
+CFLAGSCLIENT += $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
 
-CC = gcc
+#CC = gcc
 
 SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c
 OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o
@@ -94,29 +98,29 @@
 	$(RM) $@
 	$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
 
-all:: $(SYNAPTICS_DRV) synclient syndaemon
+all:: $(SYNAPTICS_DRV) synclient
 
-install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
+install: $(BINDIR)/synclient $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
 
-install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
+install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man5/synaptics.5
 
 $(MANDIR)/man1/synclient.1: manpages/synclient.1
-	install --mode=0644 -D $< $@
+	${BSD_INSTALL_MAN} $< $@
 
 $(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1
 	install --mode=0644 -D $< $@
 
 $(MANDIR)/man5/synaptics.5: manpages/synaptics.5
-	install --mode=0644 -D $< $@
+	${BSD_INSTALL_MAN} $< $@
 
 $(BINDIR)/synclient : synclient
-	install -D $< $@
+	${BSD_INSTALL_PROGRAM} $< $@
 
 $(BINDIR)/syndaemon : syndaemon
 	install -D $< $@
 
 $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
-	install --mode=0644 -D $< $@
+	${BSD_INSTALL_DATA} $< $@
 
 $(SYNAPTICS_DRV): $(OBJS)
 	$(RM) $@