[patch] Fix compile and install issues

synaptics-freebsd.patch (text/plain), 2.19 KB, created by Roy Marples (RETIRED) on 2007-08-21 12:33:34 UTC

diff -ur a/Makefile b/Makefile
--- a/Makefile	2007-08-21 12:27:27 +0100
+++ b/Makefile	2007-08-21 12:43:14 +0100
@@ -12,7 +12,7 @@
 MANDIR = $(DESTDIR)$(PREFIX)/man
 
 ifeq ($(ARCH),)
-  ARCH = $(shell /bin/arch)
+  ARCH = $(shell uname -m)
 endif
 ifeq ($(ARCH),amd64)
   ARCH = x86_64
@@ -101,22 +101,28 @@
 install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
 
 $(MANDIR)/man1/synclient.1: manpages/synclient.1
-	install --mode=0644 -D $< $@
+	install -d $(MANDIR)/man1
+	install -m 0644 $< $@
 
 $(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1
-	install --mode=0644 -D $< $@
+	install -d $(MANDIR)/man1
+	install -m 0644 $< $@
 
 $(MANDIR)/man5/synaptics.5: manpages/synaptics.5
-	install --mode=0644 -D $< $@
+	install -d $(MANDIR)/man5
+	install -m 0644 $< $@
 
 $(BINDIR)/synclient : synclient
-	install -D $< $@
+	install -d $(BINDIR)
+	install $< $@
 
 $(BINDIR)/syndaemon : syndaemon
-	install -D $< $@
+	install -d $(BINDIR)
+	install $< $@
 
 $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
-	install --mode=0644 -D $< $@
+	install -d $(INPUT_MODULE_DIR)
+	install -m 0644 $< $@
 
 $(SYNAPTICS_DRV): $(OBJS)
 	$(RM) $@
diff -ur a/eventcomm.c b/eventcomm.c
--- a/eventcomm.c	2007-08-21 12:44:03 +0100
+++ b/eventcomm.c	2007-08-21 12:27:27 +0100
@@ -60,6 +60,7 @@
 static Bool
 event_query_is_touchpad(int fd)
 {
+#ifdef _IOC_READ 
     int ret;
     unsigned long evbits[NBITS(KEY_MAX)];
 
@@ -88,6 +89,9 @@
 	return FALSE;
 
     return TRUE;
+#else
+    return FALSE;
+#endif
 }
 
 static Bool
diff -ur a/syndaemon.c b/syndaemon.c
--- a/syndaemon.c	2006-04-16 20:31:43 +0100
+++ b/syndaemon.c	2007-08-21 12:33:38 +0100
@@ -81,7 +81,10 @@
     static int signals[] = {
 	SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT,
 	SIGBUS, SIGFPE, SIGUSR1, SIGSEGV, SIGUSR2, SIGPIPE,
-	SIGALRM, SIGTERM, SIGPWR
+	SIGALRM, SIGTERM
+#ifdef SIGPWR
+		, SIGPWR
+#endif
     };
     int i;
     struct sigaction act;
@@ -90,7 +93,7 @@
     sigemptyset(&set);
     act.sa_handler = signal_handler;
     act.sa_mask = set;
-    act.sa_flags = SA_ONESHOT;
+    act.sa_flags = SA_RESETHAND;
 
     for (i = 0; i < sizeof(signals) / sizeof(int); i++) {
 	if (sigaction(signals[i], &act, 0) == -1) {