Author: kelnos
Date: 2007-02-22 17:51:09 +0000 (Thu, 22 Feb 2007)
New Revision: 25017
Modified:
xfdesktop/trunk/configure.ac.in
xfdesktop/trunk/modules/menu/menu-data/Makefile.am
xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in
Log:
fix weirdness with $prefix and expand $datadir properly
Modified: xfdesktop/trunk/configure.ac.in
===================================================================
--- xfdesktop/trunk/configure.ac.in 2007-02-22 16:49:24 UTC (rev 25016)
+++ xfdesktop/trunk/configure.ac.in 2007-02-22 17:51:09 UTC (rev 25017)
@@ -59,16 +59,26 @@
AC_SUBST([TDB_U32_TYPE])
AC_MSG_RESULT([$TDB_U32_TYPE])
-dnl figure out extra menu data dir
-if test "x$datadir" = "x\${datarootdir}"; then
- datadir="$datarootdir"
+AC_DEFUN([BT_EXPAND_VAR], [
+var_cur="$2"
+while test "x${var_cur}" != "x${var_last}"; do
+ var_last="${var_cur}"
+ var_cur=`eval "echo ${var_cur}"`
+done
+
+# autoconf, you suck (though with dubiously-good reason)
+if echo "${var_cur}" | grep -q NONE; then
+ var_cur=`echo ${var_cur} | sed -e 's:NONE:/usr/local:'`
fi
-if test "x$datadir" = "x\${prefix}/share"; then
- datadir="$prefix/share"
-fi
-EXTRA_MENU_DATA_DIR="$datadir/xfce4/xfdesktop/extra-menu-data"
-AC_SUBST(EXTRA_MENU_DATA_DIR)
+$1="${var_cur}"
+])
+
+dnl figure out extra menu data dir
+BT_EXPAND_VAR(real_datadir, $datadir)
+XFCE_MENU_DATA_DIR="$real_datadir/xfce4/menu-data"
+AC_SUBST(XFCE_MENU_DATA_DIR)
+
dnl Check for i18n support
XDT_I18N([EMAIL PROTECTED]@])
Modified: xfdesktop/trunk/modules/menu/menu-data/Makefile.am
===================================================================
--- xfdesktop/trunk/modules/menu/menu-data/Makefile.am 2007-02-22 16:49:24 UTC
(rev 25016)
+++ xfdesktop/trunk/modules/menu/menu-data/Makefile.am 2007-02-22 17:51:09 UTC
(rev 25017)
@@ -1,4 +1,4 @@
-desktopdir = $(datadir)/xfce4/xfdesktop/extra-menu-data
+desktopdir = @XFCE_MENU_DATA_DIR@
desktop_DATA = \
about-xfce.desktop \
file-manager.desktop \
Modified: xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in
===================================================================
--- xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in
2007-02-22 16:49:24 UTC (rev 25016)
+++ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in
2007-02-22 17:51:09 UTC (rev 25017)
@@ -4,7 +4,7 @@
<Menu>
<Name>Xfce</Name>
- <AppDir>@EXTRA_MENU_DATA_DIR@</AppDir>
+ <AppDir>@XFCE_MENU_DATA_DIR@</AppDir>
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
