diff -up netdude-0.5.0/configure.in.path netdude-0.5.0/configure.in --- netdude-0.5.0/configure.in.path 2008-08-28 15:58:22.000000000 +0200 +++ netdude-0.5.0/configure.in 2008-10-17 23:41:34.000000000 +0200 @@ -93,6 +93,21 @@ packagedatadir=`eval eval eval eval "ech AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packagedatadir}", [The data dir of the package]) dnl ################################################## +dnl # Set PACKAGE_LIB_DIR in config.h. +dnl ################################################## +if test "x${libdir}" = 'x${prefix}/lib'; then + if test "x${prefix}" = "xNONE"; then + packagelibdir="${ac_default_prefix}/lib/${PACKAGE}" + else + packagelibdir="${prefix}/lib/${PACKAGE}" + fi +else + packagelibdir="${libdir}/${PACKAGE}" +fi +packagelibdir=`eval eval eval eval "echo $packagelibdir"` +AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${packagelibdir}", [The lib dir of the package]) + +dnl ################################################## dnl # Set PACKAGE_SOURCE_DIR in config.h. dnl ################################################## packagesrcdir=`cd $srcdir && pwd` diff -up netdude-0.5.0/plugins/BPF-Filter/Makefile.am.path netdude-0.5.0/plugins/BPF-Filter/Makefile.am --- netdude-0.5.0/plugins/BPF-Filter/Makefile.am.path 2008-10-17 23:42:56.000000000 +0200 +++ netdude-0.5.0/plugins/BPF-Filter/Makefile.am 2008-10-17 23:43:17.000000000 +0200 @@ -7,7 +7,7 @@ LIBS = AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/plugins +pkgdir = $(pkglibdir)/$(version_major)/plugins pkg_LTLIBRARIES = nd_bpf.la diff -up netdude-0.5.0/plugins/ChecksumFix/Makefile.am.path netdude-0.5.0/plugins/ChecksumFix/Makefile.am --- netdude-0.5.0/plugins/ChecksumFix/Makefile.am.path 2008-10-17 23:42:56.000000000 +0200 +++ netdude-0.5.0/plugins/ChecksumFix/Makefile.am 2008-10-17 23:43:17.000000000 +0200 @@ -7,7 +7,7 @@ LIBS = AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/plugins +pkgdir = $(pkglibdir)/$(version_major)/plugins pkg_LTLIBRARIES = nd_cksumfix.la diff -up netdude-0.5.0/plugins/Makefile.am.path netdude-0.5.0/plugins/Makefile.am diff -up netdude-0.5.0/protocols/arp/Makefile.am.path netdude-0.5.0/protocols/arp/Makefile.am --- netdude-0.5.0/protocols/arp/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/arp/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/arp pkg_LTLIBRARIES = nd_arp.la diff -up netdude-0.5.0/protocols/ether/Makefile.am.path netdude-0.5.0/protocols/ether/Makefile.am --- netdude-0.5.0/protocols/ether/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/ether/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ether pkg_LTLIBRARIES = nd_ethernet.la diff -up netdude-0.5.0/protocols/fddi/Makefile.am.path netdude-0.5.0/protocols/fddi/Makefile.am --- netdude-0.5.0/protocols/fddi/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/fddi/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/fddi pkg_LTLIBRARIES = nd_fddi.la diff -up netdude-0.5.0/protocols/icmp/Makefile.am.path netdude-0.5.0/protocols/icmp/Makefile.am --- netdude-0.5.0/protocols/icmp/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/icmp/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/icmp pkg_LTLIBRARIES = nd_icmp.la diff -up netdude-0.5.0/protocols/ip/Makefile.am.path netdude-0.5.0/protocols/ip/Makefile.am --- netdude-0.5.0/protocols/ip/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/ip/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ip pkg_LTLIBRARIES = nd_ip.la diff -up netdude-0.5.0/protocols/linux-sll/Makefile.am.path netdude-0.5.0/protocols/linux-sll/Makefile.am --- netdude-0.5.0/protocols/linux-sll/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/linux-sll/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/linux-sll pkg_LTLIBRARIES = nd_sll.la diff -up netdude-0.5.0/protocols/Makefile.am.path netdude-0.5.0/protocols/Makefile.am diff -up netdude-0.5.0/protocols/pcap/Makefile.am.path netdude-0.5.0/protocols/pcap/Makefile.am --- netdude-0.5.0/protocols/pcap/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/pcap/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/pcap pkg_LTLIBRARIES = nd_pcap.la diff -up netdude-0.5.0/protocols/snap/Makefile.am.path netdude-0.5.0/protocols/snap/Makefile.am --- netdude-0.5.0/protocols/snap/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/snap/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/snap pkg_LTLIBRARIES = nd_snap.la diff -up netdude-0.5.0/protocols/tcp/Makefile.am.path netdude-0.5.0/protocols/tcp/Makefile.am --- netdude-0.5.0/protocols/tcp/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/tcp/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/tcp pkg_LTLIBRARIES = nd_tcp.la diff -up netdude-0.5.0/protocols/udp/Makefile.am.path netdude-0.5.0/protocols/udp/Makefile.am --- netdude-0.5.0/protocols/udp/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/udp/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/udp pkg_LTLIBRARIES = nd_udp.la diff -up netdude-0.5.0/protocols/vlan/Makefile.am.path netdude-0.5.0/protocols/vlan/Makefile.am --- netdude-0.5.0/protocols/vlan/Makefile.am.path 2008-10-17 23:42:05.000000000 +0200 +++ netdude-0.5.0/protocols/vlan/Makefile.am 2008-10-17 23:42:50.000000000 +0200 @@ -7,7 +7,7 @@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) \ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkglibdir)/$(version_major)/protocols pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/vlan pkg_LTLIBRARIES = nd_vlan.la diff -up netdude-0.5.0/src/nd_prefs.c.path netdude-0.5.0/src/nd_prefs.c --- netdude-0.5.0/src/nd_prefs.c.path 2008-08-29 16:03:55.000000000 +0200 +++ netdude-0.5.0/src/nd_prefs.c 2008-10-17 23:41:34.000000000 +0200 @@ -82,7 +82,7 @@ nd_prefs_get_plugin_dir_global(void) return dir; g_snprintf(dir, MAXPATHLEN, "%s/%s/plugins", - PACKAGE_DATA_DIR, VERSION_MAJOR); + PACKAGE_LIB_DIR, VERSION_MAJOR); return dir; } @@ -112,7 +112,7 @@ nd_prefs_get_proto_dir_global(void) return dir; g_snprintf(dir, MAXPATHLEN, "%s/%s/protocols", - PACKAGE_DATA_DIR, VERSION_MAJOR); + PACKAGE_LIB_DIR, VERSION_MAJOR); return dir; }