[Lunar-commits] r23888 - in moonbase/trunk/xfce4: apps/mousepad apps/orage apps/squeeze apps/xfce4-appfinder apps/xfce4-mixer apps/xfmedia apps/xfprint core/Thunar core/libxfce4mcs core/libxfce4util core/libxfce4util/profile.d core/libxfcegui4 core/xfce-mcs-manager core/xfce-mcs-plugins core/xfce-utils core/xfce4-dev-tools core/xfce4-panel core/xfce4-session core/xfdesktop core/xfwm4 goodies/notification-daemon-xfce goodies/thunar-archive-plugin goodies/thunar-media-tags-plugin goodies/thunar-thumbnailers goodies/thunar-volman goodies/verve-plugin goodies/xfce4-battery-plugin goodies/xfce4-cellmodem-plugin goodies/xfce4-clipman-plugin goodies/xfce4-cpufreq-plugin goodies/xfce4-cpugraph-plugin goodies/xfce4-datetime-plugin goodies/xfce4-dict-plugin goodies/xfce4-diskperf-plugin goodies/xfce4-eyes-plugin goodies/xfce4-fsguard-plugin goodies/xfce4-genmon-plugin goodies/xfce4-mount-plugin goodies/xfce4-mpc-plugin goodies/xfce4-netload-plugin goodies/xfce4-notes-plugin goodies/xfce4-quicklauncher-plugin goodies/xfce4-radio-plugin goodies/xfce4-screenshooter-plugin goodies/xfce4-sensors-plugin goodies/xfce4-smartbookmark-plugin goodies/xfce4-systemload-plugin goodies/xfce4-taskmanager goodies/xfce4-timer-plugin goodies/xfce4-wavelan-plugin goodies/xfce4-weather-plugin goodies/xfce4-xfapplet-plugin goodies/xfce4-xkb-plugin goodies/xfce4-xmms-plugin goodies/xfkc pyxfce themes/xfce-extra-icons themes/xfwm4-themes xfc xffm
Auke Kok
sofar at lunar-linux.org
Mon Apr 2 16:45:51 CEST 2007
Author: sofar
Date: 2007-04-02 16:45:51 +0200 (Mon, 02 Apr 2007)
New Revision: 23888
Modified:
moonbase/trunk/xfce4/apps/mousepad/BUILD
moonbase/trunk/xfce4/apps/orage/BUILD
moonbase/trunk/xfce4/apps/squeeze/BUILD
moonbase/trunk/xfce4/apps/xfce4-appfinder/BUILD
moonbase/trunk/xfce4/apps/xfce4-mixer/BUILD
moonbase/trunk/xfce4/apps/xfmedia/BUILD
moonbase/trunk/xfce4/apps/xfprint/BUILD
moonbase/trunk/xfce4/core/Thunar/BUILD
moonbase/trunk/xfce4/core/libxfce4mcs/BUILD
moonbase/trunk/xfce4/core/libxfce4util/BUILD
moonbase/trunk/xfce4/core/libxfce4util/POST_INSTALL
moonbase/trunk/xfce4/core/libxfce4util/profile.d/xfce4.rc
moonbase/trunk/xfce4/core/libxfcegui4/BUILD
moonbase/trunk/xfce4/core/xfce-mcs-manager/BUILD
moonbase/trunk/xfce4/core/xfce-mcs-plugins/BUILD
moonbase/trunk/xfce4/core/xfce-utils/BUILD
moonbase/trunk/xfce4/core/xfce4-dev-tools/BUILD
moonbase/trunk/xfce4/core/xfce4-panel/BUILD
moonbase/trunk/xfce4/core/xfce4-session/BUILD
moonbase/trunk/xfce4/core/xfdesktop/BUILD
moonbase/trunk/xfce4/core/xfwm4/BUILD
moonbase/trunk/xfce4/goodies/notification-daemon-xfce/BUILD
moonbase/trunk/xfce4/goodies/thunar-archive-plugin/BUILD
moonbase/trunk/xfce4/goodies/thunar-media-tags-plugin/BUILD
moonbase/trunk/xfce4/goodies/thunar-thumbnailers/BUILD
moonbase/trunk/xfce4/goodies/thunar-volman/BUILD
moonbase/trunk/xfce4/goodies/verve-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-battery-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-cellmodem-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-clipman-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-cpufreq-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-cpugraph-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-datetime-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-dict-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-diskperf-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-eyes-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-fsguard-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-genmon-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-mount-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-mpc-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-netload-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-notes-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-quicklauncher-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-radio-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-screenshooter-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-sensors-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-smartbookmark-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-systemload-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-taskmanager/BUILD
moonbase/trunk/xfce4/goodies/xfce4-timer-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-wavelan-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-weather-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-xfapplet-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-xkb-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfce4-xmms-plugin/BUILD
moonbase/trunk/xfce4/goodies/xfkc/BUILD
moonbase/trunk/xfce4/pyxfce/BUILD
moonbase/trunk/xfce4/themes/xfce-extra-icons/BUILD
moonbase/trunk/xfce4/themes/xfwm4-themes/BUILD
moonbase/trunk/xfce4/xfc/BUILD
moonbase/trunk/xfce4/xffm/BUILD
Log:
Update Xfce4 to install in /usr by default. Make sure we source in xfce4.rc where needed.
Modified: moonbase/trunk/xfce4/apps/mousepad/BUILD
===================================================================
--- moonbase/trunk/xfce4/apps/mousepad/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/apps/mousepad/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,10 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/apps/orage/BUILD
===================================================================
--- moonbase/trunk/xfce4/apps/orage/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/apps/orage/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/apps/squeeze/BUILD
===================================================================
--- moonbase/trunk/xfce4/apps/squeeze/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/apps/squeeze/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,10 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/apps/xfce4-appfinder/BUILD
===================================================================
--- moonbase/trunk/xfce4/apps/xfce4-appfinder/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/apps/xfce4-appfinder/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/apps/xfce4-mixer/BUILD
===================================================================
--- moonbase/trunk/xfce4/apps/xfce4-mixer/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/apps/xfce4-mixer/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
--disable-static \
$OPTS &&
Modified: moonbase/trunk/xfce4/apps/xfmedia/BUILD
===================================================================
--- moonbase/trunk/xfce4/apps/xfmedia/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/apps/xfmedia/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/apps/xfprint/BUILD
===================================================================
--- moonbase/trunk/xfce4/apps/xfprint/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/apps/xfprint/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/Thunar/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/Thunar/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/Thunar/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/libxfce4mcs/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/libxfce4mcs/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/libxfce4mcs/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/libxfce4util/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/libxfce4util/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/libxfce4util/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,7 +1,8 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/libxfce4util/POST_INSTALL
===================================================================
--- moonbase/trunk/xfce4/core/libxfce4util/POST_INSTALL 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/libxfce4util/POST_INSTALL 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,8 +1,8 @@
if [ -n "$XFCE4_PREFIX" ]; then
- sedit "s?/opt/lunar/xfce4?$XFCE4_PREFIX?" /etc/profile.d/xfce4.rc
+ sedit "s?/usr?$XFCE4_PREFIX?" /etc/profile.d/xfce4.rc
fi
-XFCE4LIBDIR=${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib
+XFCE4LIBDIR=${XFCE4_PREFIX:-/usr}/lib
if ! grep -q "$XFCE4LIBDIR" /etc/ld.so.conf ; then
echo "$XFCE4LIBDIR" >> /etc/ld.so.conf
ldconfig
Modified: moonbase/trunk/xfce4/core/libxfce4util/profile.d/xfce4.rc
===================================================================
--- moonbase/trunk/xfce4/core/libxfce4util/profile.d/xfce4.rc 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/libxfce4util/profile.d/xfce4.rc 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,4 +1,4 @@
-PATH=$PATH:/opt/lunar/xfce4/bin
-PKG_CONFIG_PATH=/opt/lunar/xfce4/lib/pkgconfig:$PKG_CONFIG_PATH
+PATH=$PATH:/usr/bin
+PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH
export PATH PKG_CONFIG_PATH
Modified: moonbase/trunk/xfce4/core/libxfcegui4/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/libxfcegui4/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/libxfcegui4/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
--enable-xinerama \
$OPTS &&
Modified: moonbase/trunk/xfce4/core/xfce-mcs-manager/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfce-mcs-manager/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfce-mcs-manager/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/xfce-mcs-plugins/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfce-mcs-plugins/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfce-mcs-plugins/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/xfce-utils/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfce-utils/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfce-utils/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/xfce4-dev-tools/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfce4-dev-tools/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfce4-dev-tools/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,7 +1,8 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/xfce4-panel/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfce4-panel/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfce4-panel/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/xfce4-session/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfce4-session/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfce4-session/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,11 +1,13 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
PATH="$PATH:/usr/X11/bin"
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/xfdesktop/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfdesktop/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfdesktop/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/core/xfwm4/BUILD
===================================================================
--- moonbase/trunk/xfce4/core/xfwm4/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/core/xfwm4/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,13 +1,15 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
if [ "$WITH_COMPOSITE" == "y" ]; then
OPTS="$OPTS --enable-compositor"
fi &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/notification-daemon-xfce/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/notification-daemon-xfce/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/notification-daemon-xfce/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/thunar-archive-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/thunar-archive-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/thunar-archive-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/thunar-media-tags-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/thunar-media-tags-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/thunar-media-tags-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/thunar-thumbnailers/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/thunar-thumbnailers/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/thunar-thumbnailers/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/thunar-volman/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/thunar-volman/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/thunar-volman/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/verve-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/verve-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/verve-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-battery-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-battery-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-battery-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-cellmodem-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-cellmodem-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-cellmodem-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-clipman-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-clipman-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-clipman-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-cpufreq-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-cpufreq-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-cpufreq-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-cpugraph-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-cpugraph-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-cpugraph-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-datetime-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-datetime-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-datetime-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-dict-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-dict-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-dict-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-diskperf-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-diskperf-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-diskperf-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-eyes-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-eyes-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-eyes-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-fsguard-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-fsguard-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-fsguard-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-genmon-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-genmon-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-genmon-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# Temporary fix until sofar cleans up his mess
. /etc/profile.d/xfce4.rc &&
./autogen.sh --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-mount-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-mount-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-mount-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-mpc-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-mpc-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-mpc-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-netload-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-netload-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-netload-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-notes-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-notes-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-notes-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-quicklauncher-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-quicklauncher-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-quicklauncher-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-radio-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-radio-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-radio-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-screenshooter-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-screenshooter-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-screenshooter-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-sensors-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-sensors-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-sensors-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-smartbookmark-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-smartbookmark-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-smartbookmark-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-systemload-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-systemload-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-systemload-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-taskmanager/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-taskmanager/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-taskmanager/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-timer-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-timer-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-timer-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-wavelan-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-wavelan-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-wavelan-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-weather-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-weather-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-weather-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-xfapplet-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-xfapplet-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-xfapplet-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-xkb-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-xkb-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-xkb-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfce4-xmms-plugin/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfce4-xmms-plugin/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfce4-xmms-plugin/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/goodies/xfkc/BUILD
===================================================================
--- moonbase/trunk/xfce4/goodies/xfkc/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/goodies/xfkc/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
-(
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
- export PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/bin:$PATH" &&
+(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PATH="${MODULE_PREFIX}/bin:$PATH" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/pyxfce/BUILD
===================================================================
--- moonbase/trunk/xfce4/pyxfce/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/pyxfce/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,10 +1,11 @@
-
-(
+(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/themes/xfce-extra-icons/BUILD
===================================================================
--- moonbase/trunk/xfce4/themes/xfce-extra-icons/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/themes/xfce-extra-icons/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,4 +1,6 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
prepare_install &&
chown -R root.root . &&
mkdir -p /usr/share/icons &&
Modified: moonbase/trunk/xfce4/themes/xfwm4-themes/BUILD
===================================================================
--- moonbase/trunk/xfce4/themes/xfwm4-themes/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/themes/xfwm4-themes/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,9 +1,11 @@
(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/xfc/BUILD
===================================================================
--- moonbase/trunk/xfce4/xfc/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/xfc/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,10 +1,11 @@
+(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
-(
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
Modified: moonbase/trunk/xfce4/xffm/BUILD
===================================================================
--- moonbase/trunk/xfce4/xffm/BUILD 2007-04-02 14:37:20 UTC (rev 23887)
+++ moonbase/trunk/xfce4/xffm/BUILD 2007-04-02 14:45:51 UTC (rev 23888)
@@ -1,10 +1,11 @@
-
-(
+(
+ [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
# make sure proper PKG_CONFIG_PATH is set
- export PKG_CONFIG_PATH="${XFCE4_PREFIX:-/opt/lunar/xfce4}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+ export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
./configure --build=$BUILD \
- --prefix=${XFCE4_PREFIX:-/opt/lunar/xfce4} \
+ --prefix=${MODULE_PREFIX} \
$OPTS &&
default_make
More information about the Lunar-commits
mailing list