[Xfce4-commits] r29478 - xfce-utils/trunk/scripts

[Jannis Pohlmann]

Author: jannis
Date: 2009-02-11 10:31:14 +0000 (Wed, 11 Feb 2009)
New Revision: 29478

Modified:
   xfce-utils/trunk/scripts/Makefile.am
   xfce-utils/trunk/scripts/startxfce4.in
   xfce-utils/trunk/scripts/xfhelp4.in
   xfce-utils/trunk/scripts/xinitrc.in.in
Log:
Use @_sysconfdir_@ and @_datadir_@ in scripts created by the Makefile in
order to avoid @sysconfdir@/@datadir@ to be expanded in scripts that are
created in two stages (configure + Makefile). This only affects xinitrc
right now, but who knows about the future. This fixes bug #4924.

Modified: xfce-utils/trunk/scripts/Makefile.am
===================================================================
--- xfce-utils/trunk/scripts/Makefile.am	2009-02-11 01:59:02 UTC (rev 29477)
+++ xfce-utils/trunk/scripts/Makefile.am	2009-02-11 10:31:14 UTC (rev 29478)
@@ -12,10 +12,10 @@
 
 # cannot be set from configure, because ${prefix} is not expanded
 edit = sed \
-	-e 's, at datadir\@,$(datadir),g' \
-	-e 's, at sysconfdir\@,$(sysconfdir),g' \
-	-e 's, at BROWSER_DEFAULT\@, at BROWSER_DEFAULT@,g' \
-	-e 's, at TERMINAL_DEFAULT\@, at TERMINAL_DEFAULT@,g'
+	-e "s, at _datadir_\@,$(datadir),g" \
+	-e "s, at _sysconfdir_\@,$(sysconfdir),g" \
+	-e "s, at BROWSER_DEFAULT\@, at BROWSER_DEFAULT@,g" \
+	-e "s, at TERMINAL_DEFAULT\@, at TERMINAL_DEFAULT@,g"
 
 xfbrowser4: Makefile $(srcdir)/xfbrowser4.in
 	rm -f xfbrowser4 xfbrowser4.tmp

Modified: xfce-utils/trunk/scripts/startxfce4.in
===================================================================
--- xfce-utils/trunk/scripts/startxfce4.in	2009-02-11 01:59:02 UTC (rev 29477)
+++ xfce-utils/trunk/scripts/startxfce4.in	2009-02-11 10:31:14 UTC (rev 29478)
@@ -28,9 +28,9 @@
 
 if test "x$XDG_DATA_DIRS" = "x"
 then
-  XDG_DATA_DIRS="/usr/local/share:/usr/share:@datadir@"
+  XDG_DATA_DIRS="/usr/local/share:/usr/share:@_datadir_@"
 else
-  XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@"
+  XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
 fi
 export XDG_DATA_DIRS
 
@@ -73,6 +73,6 @@
   cp $HOME/.xfce4/xinitrc $BASEDIR/
   exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
 else
-  exec $prog @sysconfdir@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC
+  exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC
 fi  
 

Modified: xfce-utils/trunk/scripts/xfhelp4.in
===================================================================
--- xfce-utils/trunk/scripts/xfhelp4.in	2009-02-11 01:59:02 UTC (rev 29477)
+++ xfce-utils/trunk/scripts/xfhelp4.in	2009-02-11 10:31:14 UTC (rev 29478)
@@ -20,7 +20,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-HELP_DIR="@datadir@/xfce4/doc"
+HELP_DIR="@_datadir_@/xfce4/doc"
 
 if [ ! x"$1" = x"" ]; then
     HELP_FILE="$1"

Modified: xfce-utils/trunk/scripts/xinitrc.in.in
===================================================================
--- xfce-utils/trunk/scripts/xinitrc.in.in	2009-02-11 01:59:02 UTC (rev 29477)
+++ xfce-utils/trunk/scripts/xinitrc.in.in	2009-02-11 10:31:14 UTC (rev 29478)
@@ -71,7 +71,7 @@
 XRESOURCES=""
 
 # Has to go prior to merging Xft.xrdb, as its the "Defaults" file
-test -r "@sysconfdir@/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES @sysconfdir@/xdg/xfce4/Xft.xrdb"
+test -r "@_sysconfdir_@/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES @_sysconfdir_@/xdg/xfce4/Xft.xrdb"
 test -r $HOME/.Xdefaults && XRESOURCES="$XRESOURCES $HOME/.Xdefaults"
 
 BASEDIR=$XDG_CONFIG_HOME/xfce4