1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
--- libnetdude-0.11/plugins/ChecksumFix/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/plugins/ChecksumFix/Makefile.am 2009-09-15 11:22:40.000000000 +0200
@@ -9,7 +9,7 @@
LDFLAGS = -L$(top_srcdir)/src
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkglibdir)/plugins
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
pkg_LTLIBRARIES = libnd_cksumfix.la
--- libnetdude-0.11/plugins/BPF-Filter/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/plugins/BPF-Filter/Makefile.am 2009-09-15 11:23:29.000000000 +0200
@@ -9,7 +9,7 @@
LDFLAGS = -L$(top_srcdir)/src
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkglibdir)/plugins
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
pkg_LTLIBRARIES = libnd_bpf.la
--- libnetdude-0.11/protocols/tcp/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/tcp/Makefile.am 2009-09-15 11:24:12.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/tcp
+pkgincludedir = $(includedir)/libnetdude/protocols/tcp
pkg_LTLIBRARIES = libnd_tcp.la
--- libnetdude-0.11/protocols/linux-sll/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/linux-sll/Makefile.am 2009-09-15 11:24:49.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/sll
+pkgincludedir = $(includedir)/libnetdude/protocols/sll
pkg_LTLIBRARIES = libnd_sll.la
--- libnetdude-0.11/protocols/fddi/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/fddi/Makefile.am 2009-09-15 11:25:31.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/fddi
+pkgincludedir = $(includedir)/libnetdude/protocols/fddi
pkg_LTLIBRARIES = libnd_fddi.la
--- libnetdude-0.11/protocols/ip/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/ip/Makefile.am 2009-09-15 11:26:22.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/ip
+pkgincludedir = $(includedir)/libnetdude/protocols/ip
pkg_LTLIBRARIES = libnd_ip.la
--- libnetdude-0.11/protocols/vlan/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/vlan/Makefile.am 2009-09-15 11:27:17.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/vlan
+pkgincludedir = $(includedir)/libnetdude/protocols/vlan
pkg_LTLIBRARIES = libnd_vlan.la
--- libnetdude-0.11/protocols/icmp/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/icmp/Makefile.am 2009-09-15 11:27:49.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/icmp
+pkgincludedir = $(includedir)/libnetdude/protocols/icmp
pkg_LTLIBRARIES = libnd_icmp.la
--- libnetdude-0.11/protocols/ether/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/ether/Makefile.am 2009-09-15 11:28:21.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
pkg_LTLIBRARIES = libnd_ethernet.la
--- libnetdude-0.11/protocols/802.11/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/802.11/Makefile.am 2009-09-15 11:29:16.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
pkg_LTLIBRARIES = libnd_802_11.la
--- libnetdude-0.11/protocols/arp/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/arp/Makefile.am 2009-09-15 11:29:48.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/arp
+pkgincludedir = $(includedir)/libnetdude/protocols/arp
pkg_LTLIBRARIES = libnd_arp.la
--- libnetdude-0.11/protocols/snap/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/snap/Makefile.am 2009-09-15 11:30:42.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/snap
+pkgincludedir = $(includedir)/libnetdude/protocols/snap
pkg_LTLIBRARIES = libnd_snap.la
--- libnetdude-0.11/protocols/udp/Makefile.am~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/protocols/udp/Makefile.am 2009-09-15 11:31:37.000000000 +0200
@@ -5,7 +5,7 @@
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkglibdir)/protocols
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/udp
+pkgincludedir = $(includedir)/libnetdude/protocols/udp
pkg_LTLIBRARIES = libnd_udp.la
--- libnetdude-0.11/src/Makefile.am~ 2009-09-15 15:40:04.000000000 +0200
+++ libnetdude-0.11/src/Makefile.am 2009-09-15 15:43:57.000000000 +0200
@@ -4,7 +4,7 @@
lib_LTLIBRARIES = libnetdude.la
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)
+pkgincludedir = $(includedir)/libnetdude
pkginclude_HEADERS = \
libnd.h \
--- libnetdude-0.11/configure.in~ 2009-09-15 11:21:16.000000000 +0200
+++ libnetdude-0.11/configure.in 2009-09-15 11:33:18.000000000 +0200
@@ -88,14 +88,14 @@
dnl ##################################################
dnl # Set PACKAGE_DATA_DIR in config.h.
dnl ##################################################
-if test "x${datadir}" = 'x${prefix}/share'; then
+if test "x${libdir}" = 'x${prefix}/lib'; then
if test "x${prefix}" = "xNONE"; then
- PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+ PACKAGE_DATA_DIR="${ac_default_prefix}/lib/${PACKAGE}"
else
- PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+ PACKAGE_DATA_DIR="${prefix}/lib/${PACKAGE}"
fi
else
- PACKAGE_DATA_DIR="${datadir}/${PACKAGE}"
+ PACKAGE_DATA_DIR="${libdir}/${PACKAGE}"
fi
PACKAGE_DATA_DIR=`eval eval eval eval "echo $PACKAGE_DATA_DIR"`
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${PACKAGE_DATA_DIR}", [The data dir of the package])
--- libnetdude-0.11/tools/lndtool.c.in~ 2008-08-29 15:50:57.000000000 +0200
+++ libnetdude-0.11/tools/lndtool.c.in 2009-09-15 16:17:24.000000000 +0200
@@ -158,7 +158,7 @@
if (strcmp("@PACKAGE_INCLUDE_DIR@", "/usr/include"))
includes = "-I@PACKAGE_INCLUDE_DIR@ ";
- printf("%s-I@prefix@/include/libnetdude/@version_major@.@version_minor@ @glib_cflags@ @pcapnav_cflags@\n",
+ printf("%s-I@prefix@/include/libnetdude @glib_cflags@ @pcapnav_cflags@\n",
includes);
}
else if (! strcmp(argv[i], "--libs"))
@@ -167,15 +167,15 @@
}
else if (! strcmp(argv[i], "--include-dir"))
{
- printf("@prefix@/include/libnetdude/@version_major@.@version_minor@\n");
+ printf("@prefix@/include/libnetdude\n");
}
else if (! strcmp(argv[i], "--plugin-dir"))
{
- printf("@PACKAGE_DATA_DIR@/@version_major@.@version_minor@/plugins\n");
+ printf("@PACKAGE_DATA_DIR@/plugins\n");
}
else if (! strcmp(argv[i], "--proto-dir"))
{
- printf("@PACKAGE_DATA_DIR@/@version_major@.@version_minor@/protocols\n");
+ printf("@PACKAGE_DATA_DIR@/protocols\n");
}
else if (! strcmp(argv[i], "--plugins") ||
! strcmp(argv[i], "-p"))
|
