Index: plugins/BPF-Filter/Makefile.in
--- plugins/BPF-Filter/Makefile.in.orig	2005-05-04 02:24:36 +0200
+++ plugins/BPF-Filter/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -106,7 +106,7 @@
 LDFLAGS = -L$(top_srcdir)/src
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 
 pkg_LTLIBRARIES = libnd_bpf.la
 pkginclude_HEADERS = libnd_bpf.h
Index: plugins/ChecksumFix/Makefile.in
--- plugins/ChecksumFix/Makefile.in.orig	2005-05-04 02:24:36 +0200
+++ plugins/ChecksumFix/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -106,7 +106,7 @@
 LDFLAGS = -L$(top_srcdir)/src
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 
 pkg_LTLIBRARIES = libnd_cksumfix.la
 pkginclude_HEADERS = libnd_cksumfix.h
Index: protocols/arp/Makefile.in
--- protocols/arp/Makefile.in.orig	2005-05-04 02:24:36 +0200
+++ protocols/arp/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/arp
+pkgincludedir = $(includedir)/libnetdude/protocols/arp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_arp.la 
 
Index: protocols/ether/Makefile.in
--- protocols/ether/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/ether/Makefile.in	2005-05-06 09:09:20 +0200
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_ethernet.la 
 
Index: protocols/fddi/Makefile.in
--- protocols/fddi/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/fddi/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/fddi
+pkgincludedir = $(includedir)/libnetdude/protocols/fddi
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_fddi.la 
 pkginclude_HEADERS = libnd_fddi.h
Index: protocols/icmp/Makefile.in
--- protocols/icmp/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/icmp/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/icmp
+pkgincludedir = $(includedir)/libnetdude/protocols/icmp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_icmp.la 
 pkginclude_HEADERS = libnd_icmp.h
Index: protocols/ip/Makefile.in
--- protocols/ip/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/ip/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/ip
+pkgincludedir = $(includedir)/libnetdude/protocols/ip
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_ip.la 
 pkginclude_HEADERS = libnd_ip.h
Index: protocols/linux-sll/Makefile.in
--- protocols/linux-sll/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/linux-sll/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/sll
+pkgincludedir = $(includedir)/libnetdude/protocols/sll
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_sll.la 
 
Index: protocols/snap/Makefile.in
--- protocols/snap/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/snap/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/snap
+pkgincludedir = $(includedir)/libnetdude/protocols/snap
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_snap.la 
 
Index: protocols/tcp/Makefile.in
--- protocols/tcp/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/tcp/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/tcp
+pkgincludedir = $(includedir)/libnetdude/protocols/tcp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_tcp.la 
 
Index: protocols/udp/Makefile.in
--- protocols/udp/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/udp/Makefile.in	2005-05-06 09:09:20 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/udp
+pkgincludedir = $(includedir)/libnetdude/protocols/udp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -102,7 +102,7 @@
 
 INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = libnd_udp.la 
 pkginclude_HEADERS = libnd_udp.h
Index: src/Makefile.in
--- src/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ src/Makefile.in	2005-05-06 09:09:20 +0200
@@ -65,7 +65,7 @@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)
+pkgincludedir = $(includedir)/libnetdude
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
Index: src/libnd_prefs.c
--- src/libnd_prefs.c.orig	2004-05-11 00:51:37 +0200
+++ src/libnd_prefs.c	2005-05-06 09:09:20 +0200
@@ -130,8 +130,8 @@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-	     PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+	     PACKAGE_DATA_DIR);
 
   return dir;
 }
@@ -145,8 +145,8 @@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-	     libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+	     libnd_prefs_get_netdude_dir());
 
   return dir;
 }
@@ -160,8 +160,8 @@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-	     PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+	     PACKAGE_DATA_DIR);
 
   return dir;
 }
@@ -175,8 +175,8 @@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-	     libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+	     libnd_prefs_get_netdude_dir());
 
   return dir;
 }
@@ -492,8 +492,8 @@
 	    return FALSE;
 	}
 
-      g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-		 libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+      g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+		 libnd_prefs_get_netdude_dir());
 
       if (mkdir(dir, mode_755) < 0)
 	{
@@ -501,8 +501,8 @@
 	    return FALSE;
 	}
 
-      g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-		 libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+      g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+		 libnd_prefs_get_netdude_dir());
       
       if (mkdir(dir, mode_755) < 0)
 	{
Index: tools/Makefile.in
--- tools/Makefile.in.orig	2005-05-04 02:24:38 +0200
+++ tools/Makefile.in	2005-05-06 09:09:20 +0200
@@ -116,7 +116,7 @@
 am_lndtool_OBJECTS = lndtool.$(OBJEXT)
 lndtool_OBJECTS = $(am_lndtool_OBJECTS)
 lndtool_DEPENDENCIES =
-lndtool_LDFLAGS =
+lndtool_LDFLAGS = -static -export-dynamic -export-symbols-regex='.*'
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
Index: tools/lndtool.c.in
--- tools/lndtool.c.in.orig	2005-03-26 16:37:35 +0100
+++ tools/lndtool.c.in	2005-05-06 09:09:20 +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"))
