From ea705e71190140a99a7ac4d32d0adb91e66fbc61 Mon Sep 17 00:00:00 2001 From: ist Date: Mon, 6 Aug 2012 16:53:12 +0200 Subject: Fixed environment variables. --- raptor_rasqal-install | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/raptor_rasqal-install b/raptor_rasqal-install index 7a9d5fd..1ff2a78 100755 --- a/raptor_rasqal-install +++ b/raptor_rasqal-install @@ -13,33 +13,35 @@ check_utils "wget tar make" mkdir -p $PREFIX/tmp cd $OT_PREFIX/tmp/ cmd="$WGET http://download.librdf.org/source/"$RAPTOR2".tar.gz" && run_cmd "$cmd" "Download $RAPTOR2" -cmd="$WGET http://download.librdf.org/source/"$RASQAL".tar.gz" && run_cmd "$cmd" "Download $RASQAL" export RAPTOR2_DIR=$OT_PREFIX/$SELF/$RAPTOR2 cmd="$TAR xvzf "$RAPTOR2".tar.gz" && run_cmd "$cmd" "Unzip $RAPTOR2" rm $RAPTOR2.tar.gz cd $RAPTOR2 -cmd="./configure --prefix=$RAPTOR2_DIR --exec-prefix=$RAPTOR2_DIR --with-storage-path=$RAPTOR2_DIR/var/lib --with-config-file=$RAPTOR2_DIR/$SELF.conf -with-http-log=$RAPTOR2_DIR/log" && run_cmd "$cmd" "Configure" +cmd="./configure --prefix=$RAPTOR2_DIR" && run_cmd "$cmd" "Configure" cmd="$MAKE" && run_cmd "$cmd" "Make" cmd="$MAKE install" && run_cmd "$cmd" "Make Install" # Config -echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$RAPTOR2_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH:$RAPTOR2_DIR/lib\"; fi" >> "$RAPTOR2_CONF" +echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"\$RAPTOR2_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"\$RAPTOR2_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RAPTOR2_CONF" echo "$SELF configuration has been stored in '$RAPTOR2_CONF'." if ! grep "$RAPTOR2_CONF" $OT_UI_CONF >/dev/null 2>&1; then echo '. '$RAPTOR2_CONF >> $OT_UI_CONF fi cd .. -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH":"$RAPTOR2_DIR"/lib" +export LD_LIBRARY_PATH=$RAPTOR2_DIR"/lib:"$LD_LIBRARY_PATH +export PATH=$RAPTOR2_DIR"/bin:"$PATH +export PKG_CONFIG_PATH=$RAPTOR2_DIR"/lib/pkgconfig:"$PKG_CONFIG_PATH #Build +cmd="$WGET http://download.librdf.org/source/"$RASQAL".tar.gz" && run_cmd "$cmd" "Download $RASQAL" export RASQAL_DIR=$OT_PREFIX/$SELF/$RASQAL cmd="$TAR xvzf "$RASQAL".tar.gz" && run_cmd "$cmd" "Unzip $RASQAL" rm $RASQAL.tar.gz cd $RASQAL -cmd="./configure --prefix=$RASQAL_DIR --exec-prefix=$RASQAL_DIR --with-storage-path=$RASQAL_DIR/var/lib --with-config-file=$RASQAL_DIR/$SELF.conf -with-http-log=$RASQAL_DIR/log" && run_cmd "$cmd" "Configure" +cmd="./configure --prefix=$RASQAL_DIR" && run_cmd "$cmd" "Configure" cmd="$MAKE" && run_cmd "$cmd" "Make" cmd="$MAKE install" && run_cmd "$cmd" "Make Install" # Config -echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$RASQAL_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH:$RASQAL_DIR/lib\"; fi" >> "$RASQAL_CONF" +echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"\$RASQAL_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"\$RASQAL_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RASQAL_CONF" echo "$RASQAL configuration has been stored in '$RASQAL_CONF'." if ! grep "$RASQAL_CONF" $OT_UI_CONF >/dev/null 2>&1; then echo '. '$RASQAL_CONF >> $OT_UI_CONF -- cgit v1.2.3