summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorOliver Tappe2007-05-05 17:26:45 +0200
committerOliver Tappe2007-05-05 17:26:45 +0200
commit6df7a6ce3e1d75ff90492c41d4d1081d1ceb9755 (patch)
tree77eea6e9b8a0aa258ca32692daa5dd3d069e5fcb /Makefile
parentHope that solves the "hanging/no keyboard" X display problem: Reordering (diff)
downloadcore-6df7a6ce3e1d75ff90492c41d4d1081d1ceb9755.tar.gz
core-6df7a6ce3e1d75ff90492c41d4d1081d1ceb9755.tar.xz
core-6df7a6ce3e1d75ff90492c41d4d1081d1ceb9755.zip
* updated list of required PERL-modules
* added (rather ugly) hack that avoids overwriting the active DB-type everytime you do a 'make install' N.B.: IMHO this Makefile is a complete mess - we should think about alternatives (like Makefile.pl). git-svn-id: http://svn.openslx.org/svn/openslx/trunk@997 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 91394f23..07d0ecd0 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,8 @@ install:
@ # many of the following modules are part of core perl, but we check
@ # for them just to be sure...
- @for m in Carp DBI Fcntl FindBin Getopt::Long Pod::Usage ; do \
+ @for m in Carp DBI Digest::MD5 Fcntl File::Basename FindBin Getopt::Long \
+ Pod::Usage ; do \
if ! perl -e "use $$m" 2>>${SLX_INSTALL_LOG} ; then \
echo " The perl-module '$$m' is required, please install it."; \
exit 1; \
@@ -124,7 +125,11 @@ install:
@ # specific database modules are optional, but we tell the user if
@ # support for a database is missing:
@DEFAULT_DB_TYPE=""; \
- for m in SQLite CSV mysql; do \
+ if test -e ${SLX_CONFIG_PATH}/settings.local; then \
+ echo "Reading local settings..."; \
+ . ${SLX_CONFIG_PATH}/settings.local; \
+ fi; \
+ for m in $${SLX_DB_TYPE} SQLite CSV mysql; do \
if ! perl -e "use DBD::$$m" 2>>${SLX_INSTALL_LOG} ; then \
echo -e " 'DBD::$$m' not found, so $$m-databases will not be \
supported."; \