--- yate/Makefile.in.orig	2006-09-18 19:55:00.000000000 +0200
+++ yate/Makefile.in	2006-12-16 23:34:16.000000000 +0100
@@ -51,13 +51,15 @@
 basedir = @libdir@/yate
 confdir = @sysconfdir@/yate
 bindir = @bindir@
+datarootdir = @datarootdir@
+datadir = @datadir@
 libdir = @libdir@
 incdir = @includedir@/yate
 mandir = @mandir@
 docdir = $(prefix)/share/doc/yate-@PACKAGE_VERSION@
 vardir = @localstatedir@/lib/yate
 moddir = $(basedir)/modules
-scrdir = $(basedir)/scripts
+scrdir = $(datadir)/yate/scripts
 
 # include optional local make rules
 -include YateLocal.mak
--- yate/engine/Makefile.in.orig	2006-12-16 23:33:04.000000000 +0100
+++ yate/engine/Makefile.in	2006-12-16 23:34:06.000000000 +0100
@@ -53,6 +53,8 @@
 exec_prefix = @exec_prefix@
 
 bindir = @bindir@
+datarootdir = @datarootdir@
+datadir = @datadir@
 libdir = @libdir@
 incdir = @includedir@/yate
 mandir = @mandir@
--- yate/modules/help/Makefile.in.orig	2006-06-11 16:41:04.000000000 +0200
+++ yate/modules/help/Makefile.in	2006-12-16 23:34:47.000000000 +0100
@@ -11,10 +11,12 @@
 MKDEPS  := ../../config.status
 
 basedir = @libdir@/yate
+datarootdir = @datarootdir@
+datadir = @datadir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 moddir = $(basedir)/modules
-helpdir = $(moddir)/help
+helpdir = $(datadir)/yate/help
 
 .PHONY: all clean install uninstall
 all clean:
--- yate/modules/skin/Makefile.in.orig	2005-11-07 04:09:23.000000000 +0100
+++ yate/modules/skin/Makefile.in	2006-12-16 23:34:59.000000000 +0100
@@ -11,10 +11,12 @@
 MKDEPS  := ../../config.status
 
 basedir = @libdir@/yate
+datarootdir = @datarootdir@
+datadir = @datadir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 moddir = $(basedir)/modules
-skindir = $(moddir)/skin
+skindir = $(datadir)/yate/skin
 
 .PHONY: all clean install uninstall
 all clean:
--- yate/scripts/Makefile.in.orig	2006-07-07 02:10:45.000000000 +0200
+++ yate/scripts/Makefile.in	2006-12-16 23:36:33.000000000 +0100
@@ -8,9 +8,11 @@
 SCRLIBS := libyate.php libyatechan.php libvoicemail.php libyate.py Yate.pm
 
 basedir = @libdir@/yate
+datarootdir = @datarootdir@
+datadir = @datadir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-scrdir = $(basedir)/scripts
+scrdir = $(datadir)/yate/scripts
 
 # include optional local make rules
 -include YateLocal.mak
--- yate/yate-config.in.orig	2005-11-07 04:51:17.000000000 +0100
+++ yate/yate-config.in	2006-12-16 23:35:31.000000000 +0100
@@ -12,6 +12,8 @@
 exec_prefix="@exec_prefix@"
 moddir="@libdir@/yate"
 confdir="@sysconfdir@/yate"
+datarootdir="@datarootdir@"
+datadir="@datadir@/yate"
 s1="@MODULE_CPPFLAGS@"
 s2="-I@includedir@/yate"
 s3="@MODULE_LDFLAGS@ @MODULE_SYMBOLS@"
@@ -44,13 +46,13 @@
 	    echo "$confdir"
 	    ;;
 	--skins)
-	    echo "$moddir/modules/skin"
+	    echo "$datadir/skin"
 	    ;;
 	--modules)
 	    echo "$moddir/modules"
 	    ;;
 	--scripts)
-	    echo "$moddir/scripts"
+	    echo "$datadir/scripts"
 	    ;;
 	*)
 	    echo "I didn't understand: $1" >&2