summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSebastian2010-08-24 23:51:04 +0200
committerSebastian2010-08-24 23:51:04 +0200
commitf1015661df2c0967a169192b2080a5d0cef72a1f (patch)
treef8a220a96a7b11ee95e9617fbfd72475b2e5170b /Makefile
parentsquashfs export updated.. see #435 (diff)
downloadcore-f1015661df2c0967a169192b2080a5d0cef72a1f.tar.gz
core-f1015661df2c0967a169192b2080a5d0cef72a1f.tar.xz
core-f1015661df2c0967a169192b2080a5d0cef72a1f.zip
fix stupid errors on make install (caused by whitespaces in settings file)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 06f89665..d71ef136 100644
--- a/Makefile
+++ b/Makefile
@@ -108,8 +108,12 @@ dep-check:
@ # support for a database is missing:
@DEFAULT_DB_TYPE=""; \
if test -e ${SLX_CONFIG_PATH}/settings; then \
+ sed ${SLX_CONFIG_PATH}/settings \
+ -e "s,=,=\"," -e "s,$$,\"," \
+ > /tmp/slxsettings; \
echo "Reading local settings..."; \
- . ${SLX_CONFIG_PATH}/settings; \
+ . /tmp/slxsettings; \
+ rm /tmp/slxsettings; \
fi; \
for m in $${SLX_DB_TYPE} SQLite mysql; do \
if ! perl -Ilib -Iconfig-db -e "use OpenSLX::MetaDB::$$m" 2>>${SLX_INSTALL_LOG} ; then \