summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2007-12-01 00:02:33 -0800
committerEric Sandall2007-12-01 00:02:33 -0800
commite868045d104f8500e46e710583bdaf5b21419994 (patch)
tree13329fa3c1573caf447f701c320dd2c0b2be942d
parent975679cc32eafb75d819ab7da3cc50abea07f75d (diff)
xfce: Use correct --with-data-dir switch (Bug #14140)
-rwxr-xr-xwindowmanagers/xfce/BUILD4
-rw-r--r--windowmanagers/xfce/HISTORY3
2 files changed, 5 insertions, 2 deletions
diff --git a/windowmanagers/xfce/BUILD b/windowmanagers/xfce/BUILD
index 6be3fd5bf6..57c9c221e5 100755
--- a/windowmanagers/xfce/BUILD
+++ b/windowmanagers/xfce/BUILD
@@ -1,3 +1,3 @@
-export CPPFLAGS="-I/usr/include/freetype2" &&
-OPTS=echo "$OPTS --data-dir=${INSTALL_ROOT}/usr/share --enable-xft=yes"
+export CPPFLAGS="-I/usr/include/freetype2" &&
+OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share --enable-xft $OPTS" &&
default_build
diff --git a/windowmanagers/xfce/HISTORY b/windowmanagers/xfce/HISTORY
index 394ec44c8f..121bbab038 100644
--- a/windowmanagers/xfce/HISTORY
+++ b/windowmanagers/xfce/HISTORY
@@ -1,5 +1,8 @@
2007-11-29 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Works with any provider of LIBGIF
+ * BUILD: Pass user $OPTS last to override our settings
+ Proper data-dir switch is --with-data-dir (Bug #14140)
+ Don't use "echo" to set OPTS
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.