From 46fe9d6d11e0acee466246a0bde4160c075f77a5 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 16 Aug 2020 09:11:04 -0300
Subject: Fix: xbps: make more generic (2)

---
 share/hoarder/xbps/unix/linux/debian/install  | 3 ++-
 share/trashman/xbps/functions                 | 8 ++++----
 share/trashman/xbps/unix/linux/debian/install | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'share')

diff --git a/share/hoarder/xbps/unix/linux/debian/install b/share/hoarder/xbps/unix/linux/debian/install
index 76d0e1e..b426e2f 100755
--- 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 b1d2814..797beae 100644
--- 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 1d5c4c2..bf09e3a 100755
--- 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=""
-- 
cgit v1.2.3