diff --git a/binr/r2pm/d/unicorn b/binr/r2pm/d/unicorn index 995ef13952..3d7ee41bcd 100644 --- a/binr/r2pm/d/unicorn +++ b/binr/r2pm/d/unicorn @@ -5,12 +5,12 @@ R2PM_DESC "[r2-debug] Unicorn emulator plugin for radare2" R2PM_INSTALL() { ./configure --prefix="${R2PM_PREFIX}" - make -C unicorn - make unicorn-install + ${MAKE} -C unicorn + ${MAKE} unicorn-install } R2PM_UNINSTALL() { - make unicorn-uninstall + ${MAKE} unicorn-uninstall } R2PM_END diff --git a/binr/r2pm/d/unicorn-lib b/binr/r2pm/d/unicorn-lib index 2908e50eba..a6de8371dc 100644 --- a/binr/r2pm/d/unicorn-lib +++ b/binr/r2pm/d/unicorn-lib @@ -4,12 +4,20 @@ R2PM_GIT "https://github.com/unicorn-engine/unicorn" R2PM_DESC "[syspkg] unicorn emulation library" R2PM_INSTALL() { - make -j 4 - ${SUDO} make install PREFIX="${R2PM_PREFIX}" + ${MAKE} -j 4 + if [ "${GLOBAL}" = 1 ]; then + ${SUDO} ${MAKE} install PREFIX="${R2PM_PREFIX}" + else + ${MAKE} install PREFIX="${R2PM_PREFIX}" + fi } R2PM_UNINSTALL() { - ${SUDO} make uninstall PREFIX="${R2PM_PREFIX}" + if [ "${GLOBAL}" = 1 ]; then + ${SUDO} make uninstall PREFIX="${R2PM_PREFIX}" + else + make uninstall PREFIX="${R2PM_PREFIX}" + fi } R2PM_END diff --git a/binr/r2pm/r2pm b/binr/r2pm/r2pm index d1885c051c..711ac65897 100755 --- a/binr/r2pm/r2pm +++ b/binr/r2pm/r2pm @@ -38,6 +38,8 @@ export R2PM_HOMEWWWROOT="${R2HOMEDIR}/www" export R2PM_WWWROOT="${R2PM_HOMEWWWROOT}" # pkgconfig export PKG_CONFIG_PATH="${R2PM_HOMEPREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" +export CFLAGS="-I${R2PM_HOMEPREFIX}/include" +export LDFLAGS="-L${R2PM_HOMEPREFIX}/lib" # Global Vars TRAVIS_TYPE=XX