diff --git a/binr/r2pm/d/vala b/binr/r2pm/d/vala index 7fb54afadf..02af75c6da 100644 --- a/binr/r2pm/d/vala +++ b/binr/r2pm/d/vala @@ -4,7 +4,7 @@ R2PM_GIT "https://github.com/radare/radare2" R2PM_DESC "[syspkg] Vala compiler from git" R2PM_INSTALL() { - sys/vala.sh + sys/vala.sh "${R2PM_PREFIX}" } R2PM_UNINSTALL() { diff --git a/binr/r2pm/r2pm b/binr/r2pm/r2pm index 7ca7c8a944..3282fea934 100755 --- a/binr/r2pm/r2pm +++ b/binr/r2pm/r2pm @@ -31,7 +31,6 @@ export R2PM_PREFIX="${R2PM_HOMEPREFIX}" export R2PM_SYSWWWROOT="`r2 -cq -qe http.root --`" export R2PM_HOMEWWWROOT="${R2HOMEDIR}/www" export R2PM_WWWROOT="${R2PM_HOMEWWWROOT}" -echo $R2PM_WWWROOT # pkgconfig export PKG_CONFIG_PATH="${R2PM_HOMEPREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" diff --git a/sys/vala.sh b/sys/vala.sh index 785596d7e7..9bc3c60919 100755 --- a/sys/vala.sh +++ b/sys/vala.sh @@ -16,8 +16,8 @@ if [ $? = 0 ]; then export CC fi -valac --help > /dev/null 2>&1 -if [ ! $? = 0 ]; then +#valac --help > /dev/null 2>&1 +#if [ ! $? = 0 ]; then # must install from tarball VV=0.13.4 SV=$(echo ${VV}|cut -d . -f 1,2) @@ -26,11 +26,15 @@ if [ ! $? = 0 ]; then tar xjvf vala-${VV}.tar.bz2 fi cd vala-${VV} || exit 1 - ./configure --prefix=/usr && \ - make && \ - sudo make install + ./configure --prefix="${PREFIX}" || exit 1 + make || exit 1 + sudo make install || exit 1 cd .. -fi +#fi + +exit 0 + +# git install if [ -d vala ]; then cd vala