diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2020-08-16 09:11:04 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2020-08-16 09:11:04 -0300 |
| commit | 46fe9d6d11e0acee466246a0bde4160c075f77a5 (patch) | |
| tree | 279ffa5212fbc358708ad4c7909d951cf77195a1 | |
| parent | b2fde4625c0d83f9dcfc98102fd1e40d6388f2b9 (diff) | |
| download | trashman-46fe9d6d11e0acee466246a0bde4160c075f77a5.tar.gz trashman-46fe9d6d11e0acee466246a0bde4160c075f77a5.tar.bz2 | |
Fix: xbps: make more generic (2)
| -rwxr-xr-x | share/hoarder/xbps/unix/linux/debian/install | 3 | ||||
| -rw-r--r-- | share/trashman/xbps/functions | 8 | ||||
| -rwxr-xr-x | share/trashman/xbps/unix/linux/debian/install | 1 |
3 files changed, 7 insertions, 5 deletions
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="" |