Index: scripts/Makefile.am
===================================================================
--- scripts/Makefile.am	(revision 24277)
+++ scripts/Makefile.am	(working copy)
@@ -12,6 +12,8 @@
 
 # cannot be set from configure, because ${prefix} is not expanded
 edit = sed \
+	-e 's,@bindir\@,$(bindir),g' \
+	-e 's,@libdir\@,$(libdir),g' \
 	-e 's,@datadir\@,$(datadir),g' \
 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
 	-e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \
Index: scripts/startxfce4.in
===================================================================
--- scripts/startxfce4.in	(revision 24277)
+++ scripts/startxfce4.in	(working copy)
@@ -19,6 +19,11 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
+export PATH="@bindir@:$PATH"
+export LD_LIBRARY_PATH="@libdir@:$LD_LIBRARY_PATH"
+export PKG_CONFIG_PATH="@libdir@/pkgconfig:$PKG_CONFIG_PATH"
+
+
 if test x"$XDG_CONFIG_HOME" = x""
 then
   BASEDIR=$HOME/.config/xfce4/