From f61f6f991149cd56a1ce5ec9c576886c98216719 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 27 Jan 2016 16:48:39 +0100
Subject: [PATCH] Change the meaning of $dir_sysroot a bit

---
 astronaut/astronaut                       | 4 ++--
 satellites/bin/ctrulib.sat                | 4 ++--
 satellites/bin/default_arm7.sat           | 4 ++--
 satellites/bin/devkitarm.sat              | 6 +++---
 satellites/bin/libfat-nds.sat             | 4 ++--
 satellites/bin/libnds.sat                 | 4 ++--
 satellites/bin/palemoon.sat               | 4 ++--
 satellites/functions/compile/configure.sh | 2 +-
 satellites/vcs/ctr.sat                    | 4 ++--
 satellites/vcs/ctrff.sat                  | 4 ++--
 satellites/vcs/ctrulib-git.sat            | 2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/astronaut/astronaut b/astronaut/astronaut
index 2aca272..36f11e2 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -4,8 +4,8 @@
 dir_build="$PWD/build"  # Temporary directory to build packages
 dir_source="$PWD/source"  # Directory where the package sources will be placed
 dir_install="$PWD/install"  # Directory where the package will be installed
-dir_sysroot=""  # The root dir (Used for dirs like etc and var)
-dir_prefix="$dir_sysroot/usr"  # Prefix directory (Should always contain $dir_sysroot!)
+dir_sysroot=""  # The root dir (The directory programs will look in and symlinks will point to)
+dir_prefix="usr"  # Prefix directory
 cmd_download="curl -# -L -o {dst} {src}"  # Command to execute to download files
 cmd_extract="tar -x -C {dst} -f {src}"  # Command to execute to extract files
 unset _dir_satellites  # Directory where the satellite files are placed.
diff --git a/satellites/bin/ctrulib.sat b/satellites/bin/ctrulib.sat
index a443113..e36d0ea 100644
--- a/satellites/bin/ctrulib.sat
+++ b/satellites/bin/ctrulib.sat
@@ -8,7 +8,7 @@ download "https://sourceforge.net/projects/devkitpro/files/$libname/$version/$li
          "9c65ae1f9474a03a727d346c6507d4b4"
 header_end
 
-mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$libname"
-extract "$libname-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$libname"
+mkdir -p "$dir_install/opt/devkitPRO/$libname"
+extract "$libname-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/bin/default_arm7.sat b/satellites/bin/default_arm7.sat
index 30241a7..f2b6f75 100644
--- a/satellites/bin/default_arm7.sat
+++ b/satellites/bin/default_arm7.sat
@@ -8,7 +8,7 @@ download "https://sourceforge.net/projects/devkitpro/files/default arm7/$version
          "11cf9d749c3d346ca35c5d586364fad3"
 header_end
 
-mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$libname"
-extract "$name-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$libname"
+mkdir -p "$dir_install/opt/devkitPRO/$libname"
+extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/bin/devkitarm.sat b/satellites/bin/devkitarm.sat
index 0be4a85..dca108b 100644
--- a/satellites/bin/devkitarm.sat
+++ b/satellites/bin/devkitarm.sat
@@ -8,9 +8,9 @@ download "https://sourceforge.net/projects/devkitpro/files/$name/${name}_$versio
 extrafile "devkitarm.sh"
 header_end
 
-mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO"
-extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO"
+mkdir -p "$dir_install/opt/devkitPRO"
+extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/opt/devkitPRO"
 sed -i -e "s@%SYSROOT%@$dir_sysroot@g" devkitarm.sh
-install -Dm644 devkitarm.sh "$dir_install/$dir_sysroot/etc/profile.d/devkitarm.sh"
+install -Dm644 devkitarm.sh "$dir_install/etc/profile.d/devkitarm.sh"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/bin/libfat-nds.sat b/satellites/bin/libfat-nds.sat
index 26b4ee0..4eb48e3 100644
--- a/satellites/bin/libfat-nds.sat
+++ b/satellites/bin/libfat-nds.sat
@@ -8,7 +8,7 @@ download "https://sourceforge.net/projects/devkitpro/files/libfat/$version/$name
          "cc1712a56c8b0c133974936c69599f0e"
 header_end
 
-mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$libname"
-extract "$name-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$libname"
+mkdir -p "$dir_install/opt/devkitPRO/$libname"
+extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/bin/libnds.sat b/satellites/bin/libnds.sat
index 5bacd42..442df08 100644
--- a/satellites/bin/libnds.sat
+++ b/satellites/bin/libnds.sat
@@ -7,7 +7,7 @@ download "https://sourceforge.net/projects/devkitpro/files/$name/$version/$name-
          "49f4e8dfee73c3fd9897cf314eb6d359"
 header_end
 
-mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$name"
-extract "$name-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$name"
+mkdir -p "$dir_install/opt/devkitPRO/$name"
+extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$name"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/bin/palemoon.sat b/satellites/bin/palemoon.sat
index 545b23d..eb9432b 100644
--- a/satellites/bin/palemoon.sat
+++ b/satellites/bin/palemoon.sat
@@ -7,13 +7,13 @@ download "http://linux.palemoon.org/files/$version/$name-$version.en-US.linux-x8
 extrafile "palemoon.desktop"
 header_end
 
-mkdir -p "$dir_install/$dir_sysroot/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \
+mkdir -p "$dir_install/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \
          "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps" \
          "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps" \
          "$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps" \
          "$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps" \
 
-extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/$dir_sysroot/opt"
+extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/opt"
 ln -s "$dir_sysroot/opt/$name/$name" "$dir_install/$dir_prefix/bin/$name"
 ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default16.png" "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps/$name.png"
 ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default32.png" "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps/$name.png"
diff --git a/satellites/functions/compile/configure.sh b/satellites/functions/compile/configure.sh
index 0a69903..1f0be0d 100644
--- a/satellites/functions/compile/configure.sh
+++ b/satellites/functions/compile/configure.sh
@@ -1,5 +1,5 @@
 compile_configure() {
-    ./configure --prefix="$dir_prefix" --sysconfdir="$dir_sysroot/etc" $@
+    ./configure --prefix="$dir_prefix" --sysconfdir=/etc $@
     make
     option !no_check make check
     make DESTDIR="$dir_install" install
diff --git a/satellites/vcs/ctr.sat b/satellites/vcs/ctr.sat
index a23ec80..09fc91c 100644
--- a/satellites/vcs/ctr.sat
+++ b/satellites/vcs/ctr.sat
@@ -6,7 +6,7 @@ vcs_git "https://github.com/b1l1s/$name"
 header_end
 
 cd "$name"
-mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
-make DEVKITARM="$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM" install
+mkdir -p "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
+make DEVKITARM="$dir_install/opt/devkitPRO/devkitARM" install
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/vcs/ctrff.sat b/satellites/vcs/ctrff.sat
index ed63e40..e9b0cb3 100644
--- a/satellites/vcs/ctrff.sat
+++ b/satellites/vcs/ctrff.sat
@@ -6,7 +6,7 @@ vcs_git "https://github.com/b1l1s/$name"
 header_end
 
 cd "$name"
-mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
-make DEVKITARM="$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM" install
+mkdir -p "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
+make DEVKITARM="$dir_install/opt/devkitPRO/devkitARM" install
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/vcs/ctrulib-git.sat b/satellites/vcs/ctrulib-git.sat
index 80eb226..60796e2 100644
--- a/satellites/vcs/ctrulib-git.sat
+++ b/satellites/vcs/ctrulib-git.sat
@@ -6,6 +6,6 @@ vcs_git "https://github.com/smealum/$name"
 header_end
 
 cd "$name/libctru"
-make DEVKITPRO="$dir_install/$dir_sysroot/opt/devkitPRO" install
+make DEVKITPRO="$dir_install/opt/devkitPRO" install
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et: