New commits:
commit 2a7bfb586d33cea5091810257afe5ab035b4907e
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>
xorg-lib/libxpm: add optional dependency on ncompress
commit 893ef3fd5c7a58e780e49fcef86f3118c87cc2d4
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>
archive/ncompress: fix installation
commit 614704c0199877bfa1d8e0b0c1039038fdaf0e74
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>
FUNCTIONS: quote $INSTALL_ROOT to avoid words splitting
diff --git a/ChangeLog b/ChangeLog
index e310057..0134fa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2023-02-04 Florian Franzmann <bwlf AT bandrate.org>
+ * FUNCTIONS: quote INSTALL_ROOT to avoid word splitting
+
2023-02-02 Treeve Jelbert <treeve AT sourcemage.org>
* rename libkdegames5 => libkdegames
diff --git a/FUNCTIONS b/FUNCTIONS
index 9081b45..849b383 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -147,8 +147,8 @@ function install_shell ()
#installing shell into /etc/shells
message "installing $1 into /etc/shells"
- if ! ( grep -q "^${2}$" ${INSTALL_ROOT}/etc/shells ) ; then
- echo "$2" >> ${INSTALL_ROOT}/etc/shells
+ if ! ( grep -q "^${2}$" "${INSTALL_ROOT}"/etc/shells ) ; then
+ echo "$2" >> "${INSTALL_ROOT}"/etc/shells
fi || return 1
#installing shell into qingy's session dir if it's installed
@@ -694,7 +694,7 @@ cmake_build() {
fi &&
cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
+ -DCMAKE_INSTALL_SYSCONFDIR="$INSTALL_ROOT"/etc \
-DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
@@ -876,11 +876,11 @@ function default_build_configure() {
# We could write wrappers for all of the possible binaries
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"