summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-04-26 09:54:58 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-04-26 09:54:58 (GMT)
commitb944c2af68a47be948f40b37176f9959ffccc0b9 (patch)
tree4a5c73dc2ed83ba53b007fa2ae7c0bbbe9d519ef
parent0d50c30becc147918b091c02b41502829b8083a3 (diff)
parentfd4b42ec54cb8d6faf2b0f16e580f376e8cf6982 (diff)
downloadDoxygen-b944c2af68a47be948f40b37176f9959ffccc0b9.zip
Doxygen-b944c2af68a47be948f40b37176f9959ffccc0b9.tar.gz
Doxygen-b944c2af68a47be948f40b37176f9959ffccc0b9.tar.bz2
Merge pull request #161 from albert-github/feature/bug_728654
Bug 728654 - configuration stops with settings.h missing
-rwxr-xr-xconfigure10
-rw-r--r--src/lang_cfg.py2
2 files changed, 4 insertions, 8 deletions
diff --git a/configure b/configure
index f046fcb..82a081e 100755
--- a/configure
+++ b/configure
@@ -51,7 +51,7 @@ f_libclangstatic=NO
# first setup the list with availabe languages, so we cannot forget any
# list will be in case as specified (f_langs) and in uppercase (f_ulangs) as used in the internal perl script
#
-f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ',' | sed -e 's/,$//'`
+f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ','`
while test -n "$1"; do
case $1 in
@@ -708,13 +708,9 @@ fi
# -----------------------------------------------------------------------------
-if ! test -d "generated_src/doxygen"; then
- mkdir -p generated_src/doxygen
-fi
+mkdir -p generated_src/doxygen
if test "$f_wizard" = YES; then
- if ! test -d "generated_src/doxywizard"; then
- mkdir -p generated_src/doxywizard
- fi
+ mkdir -p generated_src/doxywizard
fi
#
diff --git a/src/lang_cfg.py b/src/lang_cfg.py
index 9ba1319..329610f 100644
--- a/src/lang_cfg.py
+++ b/src/lang_cfg.py
@@ -1,6 +1,6 @@
import sys
-if (len(sys.argv) > 0):
+if (len(sys.argv) > 1):
if (sys.argv[1] == "ENONLY"):
print "#define ENGLISH_ONLY"
else: