[Xfce4-commits] r29286 - in xfce-installers/trunk: . xfce46

[Jannis Pohlmann]

Author: jannis
Date: 2009-01-21 01:05:25 +0000 (Wed, 21 Jan 2009)
New Revision: 29286

Modified:
   xfce-installers/trunk/ChangeLog
   xfce-installers/trunk/xfce46/xfce46.xml
Log:
	* xfce46/xfce46.xml: Change i2t namespace (seriously, I don't know what
	  to use there). Add configure flags for glade files. Explicitely define
	  the xsession .desktop file prefix as $PREFIX so that normal users are
	  finally able to install xfce-utils.

Modified: xfce-installers/trunk/ChangeLog
===================================================================
--- xfce-installers/trunk/ChangeLog	2009-01-20 09:18:13 UTC (rev 29285)
+++ xfce-installers/trunk/ChangeLog	2009-01-21 01:05:25 UTC (rev 29286)
@@ -1,3 +1,10 @@
+2009-01-21	Jannis Pohlmann <jannis at xfce.org>
+
+	* xfce46/xfce46.xml: Change i2t namespace (seriously, I don't know what
+	  to use there). Add configure flags for glade files. Explicitely define
+	  the xsession .desktop file prefix as $PREFIX so that normal users are
+	  finally able to install xfce-utils.
+
 2009-01-18	Jannis Pohlmann <jannis at xfce.org>
 
 	* xfce46/: Add files for the 4.6 installer. 

Modified: xfce-installers/trunk/xfce46/xfce46.xml
===================================================================
--- xfce-installers/trunk/xfce46/xfce46.xml	2009-01-20 09:18:13 UTC (rev 29285)
+++ xfce-installers/trunk/xfce46/xfce46.xml	2009-01-21 01:05:25 UTC (rev 29286)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<installer xmlns:i2t="http://xfce.org">
+<installer xmlns:i2t="http://xfce.org/i2t">
   <i2t:application>
     <name>xfce4</name>
     <title>Xfce Desktop Environment</title>
@@ -354,6 +354,12 @@
     <package>
       <name>libxfcegui4</name>
       <title>Xfce GUI Library</title>
+      <pre-action stage="configure">
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-libglade-module-path=${PREFIX}/lib/libglade/2.0/";
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gladeui-data-root=${PREFIX}/share/glade3/";
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-gladeui-module-path=${PREFIX}/lib/glade3/modules/";
+        export CONFIGURE_FLAGS;
+      </pre-action>
     </package>
 
     <package>
@@ -366,6 +372,14 @@
       <title>Xfce Utilities</title>
       
       <pre-action stage="configure">
+        ## 
+        ## Make sure the xsession .desktop file is installed into PREFIX. The 
+        ## location defaults to /usr and thus breaks installation for normal
+        ## users unless it is explicitely defined.
+        ##
+        CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-xsession-prefix=${PREFIX}";
+        export CONFIGURE_FLAGS;
+
         sed -e "/^if test x\"\$DISPLAY\".*$/{
           i\\
           PATH=\"${PREFIX}/bin:\${PATH}\"