Attachment #128768 for bug #188832

View | Details | Raw Unified | Return to bug 188832
Collapse All | Expand All




MANDIR = $(DESTDIR)$(PREFIX)/man

ifeq ($(ARCH),)
  ARCH = $(shell uname -m)
endif
ifeq ($(ARCH),amd64)
  ARCH = x86_64

install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5

$(MANDIR)/man1/synclient.1: manpages/synclient.1
	install -d $(MANDIR)/man1
	install -m 0644 $< $@

$(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1
	install -d $(MANDIR)/man1
	install -m 0644 $< $@

$(MANDIR)/man5/synaptics.5: manpages/synaptics.5
	install -d $(MANDIR)/man5
	install -m 0644 $< $@

$(BINDIR)/synclient : synclient
	install -d $(BINDIR)
	install $< $@

$(BINDIR)/syndaemon : syndaemon
	install -d $(BINDIR)
	install $< $@

$(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
	install -d $(INPUT_MODULE_DIR)
	install -m 0644 $< $@

$(SYNAPTICS_DRV): $(OBJS)
	$(RM) $@

Lines 60-65 Link Here

(-)a/eventcomm.c (+4 lines)
60	static Bool	60	static Bool
61	event_query_is_touchpad(int fd)	61	event_query_is_touchpad(int fd)
62	{	62	{
		63	#ifdef _IOC_READ
63	int ret;	64	int ret;
64	unsigned long evbits[NBITS(KEY_MAX)];	65	unsigned long evbits[NBITS(KEY_MAX)];
65		66
Lines 88-93 Link Here
88	return FALSE;	89	return FALSE;
89		90
90	return TRUE;	91	return TRUE;
		92	#else
		93	return FALSE;
		94	#endif
91	}	95	}
92		96
93	static Bool	97	static Bool

Lines 81-87 Link Here

(-)a/syndaemon.c (-2 / +5 lines)
81	static int signals[] = {	81	static int signals[] = {
82	SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT,	82	SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT,
83	SIGBUS, SIGFPE, SIGUSR1, SIGSEGV, SIGUSR2, SIGPIPE,	83	SIGBUS, SIGFPE, SIGUSR1, SIGSEGV, SIGUSR2, SIGPIPE,
84	SIGALRM, SIGTERM, SIGPWR	84	SIGALRM, SIGTERM
		85	#ifdef SIGPWR
		86	, SIGPWR
		87	#endif
85	};	88	};
86	int i;	89	int i;
87	struct sigaction act;	90	struct sigaction act;
Lines 90-96 Link Here
90	sigemptyset(&set);	93	sigemptyset(&set);
91	act.sa_handler = signal_handler;	94	act.sa_handler = signal_handler;
92	act.sa_mask = set;	95	act.sa_mask = set;
93	act.sa_flags = SA_ONESHOT;	96	act.sa_flags = SA_RESETHAND;
94		97
95	for (i = 0; i < sizeof(signals) / sizeof(int); i++) {	98	for (i = 0; i < sizeof(signals) / sizeof(int); i++) {
96	if (sigaction(signals[i], &act, 0) == -1) {	99	if (sigaction(signals[i], &act, 0) == -1) {

Return to bug 188832

Lines 12-18 Link Here

(-)a/Makefile (-7 / +13 lines)
12	MANDIR = $(DESTDIR)$(PREFIX)/man	12	MANDIR = $(DESTDIR)$(PREFIX)/man
13		13
14	ifeq ($(ARCH),)	14	ifeq ($(ARCH),)
15	ARCH = $(shell /bin/arch)	15	ARCH = $(shell uname -m)
16	endif	16	endif
17	ifeq ($(ARCH),amd64)	17	ifeq ($(ARCH),amd64)
18	ARCH = x86_64	18	ARCH = x86_64
Lines 101-122 Link Here
101	install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5	101	install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
102		102
103	$(MANDIR)/man1/synclient.1: manpages/synclient.1	103	$(MANDIR)/man1/synclient.1: manpages/synclient.1
104	install --mode=0644 -D $< $@	104	install -d $(MANDIR)/man1
		105	install -m 0644 $< $@
105		106
106	$(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1	107	$(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1
107	install --mode=0644 -D $< $@	108	install -d $(MANDIR)/man1
		109	install -m 0644 $< $@
108		110
109	$(MANDIR)/man5/synaptics.5: manpages/synaptics.5	111	$(MANDIR)/man5/synaptics.5: manpages/synaptics.5
110	install --mode=0644 -D $< $@	112	install -d $(MANDIR)/man5
		113	install -m 0644 $< $@
111		114
112	$(BINDIR)/synclient : synclient	115	$(BINDIR)/synclient : synclient
113	install -D $< $@	116	install -d $(BINDIR)
		117	install $< $@
114		118
115	$(BINDIR)/syndaemon : syndaemon	119	$(BINDIR)/syndaemon : syndaemon
116	install -D $< $@	120	install -d $(BINDIR)
		121	install $< $@
117		122
118	$(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)	123	$(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
119	install --mode=0644 -D $< $@	124	install -d $(INPUT_MODULE_DIR)
		125	install -m 0644 $< $@
120		126
121	$(SYNAPTICS_DRV): $(OBJS)	127	$(SYNAPTICS_DRV): $(OBJS)
122	$(RM) $@	128	$(RM) $@