Fix: xbps: make more generic (2)

diff --git a/share/hoarder/xbps/unix/linux/debian/install b/share/hoarder/xbps/unix/linux/debian/install
index 76d0e1ef0c903912b6221d4d58e2b29c28365af4..b426e2fede1b778101cd61c81729c200c788343e 100755 (executable)
--- a/share/hoarder/xbps/unix/linux/debian/install
+++ b/share/hoarder/xbps/unix/linux/debian/install
@@ -6,9 +6,10 @@
 # Parameters
 SHARE="$1"
 LIB="$2"
+PREFIX="/usr"
 DESTDIR="$HOME/.xbps"
 SRC="$HOME/.local/src"
-#FLAGS="--enable-rpath"
+FLAGS="--enable-rpath"
 FLAGS=""
 
 # Include basic functions

diff --git a/share/trashman/xbps/functions b/share/trashman/xbps/functions
index b1d2814fc1b44208d6a62836abbdbcafd1cbd860..797beae05ad45c352f78052ad73150cc01f42645 100644 (file)
--- a/share/trashman/xbps/functions
+++ b/share/trashman/xbps/functions
@@ -21,10 +21,10 @@ xbps_install() {
   fi
   
   # Build and install
-  cd $SRC/xbps                                                   || exit 1
-  ./configure $FLAGS --prefix=$DESTDIR --sysconfdir=$DESTDIR/etc || exit 1
-  make -j$(nproc)                                                || exit 1
-  make DESTDIR=$DESTDIR install clean                            || exit 1
+  cd $SRC/xbps                                                 || exit 1
+  ./configure $FLAGS --prefix=$PREFIX --sysconfdir=$PREFIX/etc || exit 1
+  make -j$(nproc)                                              || exit 1
+  make DESTDIR=$DESTDIR install clean                          || exit 1
   
   # Remove source
   #rm -rf $HOME/.local/src/xbps

diff --git a/share/trashman/xbps/unix/linux/debian/install b/share/trashman/xbps/unix/linux/debian/install
index 1d5c4c22c45263291ed834d90c7e1e52bf560b1b..bf09e3ac577bbf34ef6d284e814110bc65a97b59 100755 (executable)
--- a/share/trashman/xbps/unix/linux/debian/install
+++ b/share/trashman/xbps/unix/linux/debian/install
@@ -6,6 +6,7 @@
 # Parameters
 SHARE="$1"
 BASE="$SHARE/../.."
+PREFIX="/usr"
 DESTDIR="/usr/local"
 SRC="$DESTDIR/src"
 FLAGS=""