summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2004-06-06 15:23:59 +0200
committerPeter Osterlund <petero2@telia.com>2006-04-09 04:02:27 +0200
commit1c831251b1992c575ba5d7a5460d9785567650d9 (patch)
tree267285e56131dcedf02abe3228bd902a1e786526
parent31bc44fda8663693b339ab6185cfc09bc3dcdd98 (diff)
Added a LIBDIR Makefile variable to make it easier to build
the driver on x86_64.
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a2ea0b4..8085727 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ INSTALLED_X = $(DESTDIR)/usr/X11R6
LOCAL_X = Xincludes/usr/X11R6
BINDIR = $(DESTDIR)/usr/local/bin
MANDIR = $(DESTDIR)/usr/local/man/man1
+LIBDIR = lib
ifeq ($(TOP),)
# This hack attempts to check if the needed XFree86 header files are installed.
@@ -62,7 +63,7 @@ OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o
all:: synaptics_drv.o synclient syndaemon
-install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/lib/modules/input/synaptics_drv.o install-man
+install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o install-man
install-man: $(MANDIR)/synclient.1 $(MANDIR)/syndaemon.1
@@ -78,7 +79,7 @@ $(BINDIR)/synclient : synclient
$(BINDIR)/syndaemon : syndaemon
install -D $< $@
-$(INSTALLED_X)/lib/modules/input/synaptics_drv.o : synaptics_drv.o
+$(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o : synaptics_drv.o
install -D $< $@
synaptics_drv.o: $(OBJS)
@@ -95,7 +96,7 @@ syndaemon.o : syndaemon.c
$(CC) $(CFLAGSCLIENT) -c -o $@ $<
syndaemon : syndaemon.o
- $(CC) -o $@ $< -lm -L$(INSTALLED_X)/lib -lXext -lX11
+ $(CC) -o $@ $< -lm -L$(INSTALLED_X)/$(LIBDIR) -lXext -lX11
synaptics.o : synaptics.h synproto.h Makefile
ps2comm.o : ps2comm.h synproto.h synaptics.h