1 diff -ur libspnav-0.2.2/configure libspnav/configure
2 --- libspnav-0.2.2/spnav.h.orig 2011-11-30 22:54:06.447272302 +0100
3 +++ libspnav/spnav.h 2011-11-30 22:54:25.730605731 +0100
8 -#include <spnav_config.h>
9 +#include "spnav_config.h"
13 --- libspnav-0.2.2/configure.orig 2009-07-21 00:17:15.000000000 +0200
14 +++ libspnav-0.2.2/configure 2013-02-11 20:13:32.392810184 +0100
18 srcdir="`dirname "$0"`"
22 -#if [ "`uname -m`" = 'x86_64' ]; then
25 +if [ "`uname -m`" = 'x86_64' ]; then
26 + libdir=$PREFIX/lib64
32 value=`echo $arg | sed 's/--prefix=//'`
33 PREFIX=${value:-$prefix}
37 + libdir=`echo $arg | sed 's/--libdir=//'`
44 echo " optimize for speed: $OPT"
45 echo " include debugging symbols: $DBG"
46 echo " x11 communication method: $X11"
47 +if [ -n "$CFLAGS" ]; then
48 + echo " cflags: $CFLAGS"
50 +if [ -n "$LDFLAGS" ]; then
51 + echo " ldflags: $LDFLAGS"
55 if [ "$X11" = "no" ]; then
57 echo "srcdir = $srcdir" >>Makefile
58 echo "libdir = $libdir" >>Makefile
60 +if [ -n "$CFLAGS" ]; then
61 + echo "user_cflags = $CFLAGS" >>Makefile
63 +if [ -n "$LDFLAGS" ]; then
64 + echo "user_ldflags = $LDFLAGS" >>Makefile
67 if [ "$DBG" = 'yes' ]; then
68 echo 'dbg = -g' >>Makefile
70 diff -ur libspnav-0.2.2/spnav.c libspnav/spnav.c
71 --- libspnav-0.2.2/spnav.c 2010-03-28 00:24:27.000000000 +0100
72 +++ libspnav/spnav.c 2011-11-30 23:14:24.000000000 +0100
74 #include <sys/select.h>
77 -#define SPNAV_SOCK_PATH "/var/run/spnav.sock"
78 +#define SPNAV_SOCK_PATH "/var/run/spnav.sock"
90 diff -ur libspnav-0.2.2/spnav.h libspnav/spnav.h
91 --- libspnav-0.2.2/spnav.h 2010-03-28 00:24:27.000000000 +0100
92 +++ libspnav/spnav.h 2011-11-30 23:14:24.000000000 +0100
96 /* Close connection to the daemon. Use it for X11 or AF_UNIX connections.
97 - * Returns -1 on failure
98 + * Returns -1 on failure
100 int spnav_close(void);
102 --- libspnav-0.2.2/Makefile.in.orig 2010-03-28 00:24:27.000000000 +0100
103 +++ libspnav-0.2.2/Makefile.in 2013-02-11 20:15:04.166139664 +0100
106 soname = libspnav.so.0
108 +devlink = libspnav.so
112 -CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I.
113 +CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. $(user_cflags)
114 +LDFLAGS = $(user_ldflags) -lX11
117 all: $(lib_a) $(lib_so)
122 - $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj)
123 + $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) $(LDFLAGS)
126 $(CC) $(CFLAGS) -c $< -o $@
130 install: $(lib_a) $(lib_so)
131 - cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a)
132 - cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so)
133 - for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done
134 + ln -s $(lib_so) $(soname)
135 + ln -s $(soname) $(devlink)
136 + mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(PREFIX)/include
137 + cp $(lib_a) $(DESTDIR)$(libdir)/$(lib_a)
138 + cp -d $(lib_so) $(DESTDIR)$(libdir)/$(lib_so)
139 + rm -f $(DESTDIR)$(libdir)/$(soname) $(DESTDIR)$(libdir)/$(devlink)
140 + cp $(soname) $(DESTDIR)$(libdir)/$(soname)
141 + cp -d $(devlink) $(DESTDIR)$(libdir)/$(devlink)
142 + for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
146 - rm -f $(PREFIX)/$(libdir)/$(lib_a)
147 - rm -f $(PREFIX)/$(libdir)/$(lib_so)
148 - for i in $(hdr); do rm -f $(PREFIX)/include/$$i; done
149 + rm -f $(DESTDIR)$(libdir)/$(lib_a)
150 + rm -f $(DESTDIR)$(libdir)/$(lib_so)
151 + rm -f $(DESTDIR)$(libdir)/$(soname)
152 + rm -f $(DESTDIR)$(libdir)/$(devlink)
153 + for i in $(hdr); do rm -f $(DESTDIR)$(PREFIX)/include/$$i; done