blob: 50cb7ba4343309fa9fcd49bf25c57f1a29ba7b27 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
diff --git a/bspm/configure b/bspm/configure
index 011a1e1..1bcfe10 100755
--- a/bspm/configure
+++ b/bspm/configure
@@ -11,7 +11,7 @@ subst() {
DIR=`pwd`
cd $1 && cat $2 |
sed "s @BUS_NAME@ $BUS_NAME g" |
- sed "s @R_LIBRARY_DIR@ ${R_LIBRARY_DIR#"$BUILD_ROOT"} g" > $3
+ sed "s @R_LIBRARY_DIR@ /usr/lib/R/library g" > $3
cd $DIR
}
@@ -24,7 +24,7 @@ fi
if [ "$1" != "--without-dbus-service" ]; then
SERVICE_DIR="$BUILD_ROOT/usr/share/dbus-1/system-services"
- SYSCONF_DIR="$BUILD_ROOT/etc/dbus-1/system.d"
+ SYSCONF_DIR="$BUILD_ROOT/usr/share/dbus-1/system.d"
mkdir -p $SERVICE_DIR $SYSCONF_DIR || exit 1
subst inst/service dbus.service.in $SERVICE_DIR/$BUS_NAME.service
subst inst/service dbus.conf.in $SYSCONF_DIR/$BUS_NAME.conf
|