Merge branch 'master' of tourmaline:git/lw-build-system

scripts/build.docs.doxygen/instantiate

@@ -5,6 +5,7 @@ then
 fi
 
 do_parameter_subst
+add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.files.none/build.install-files

@@ -7,7 +7,7 @@ build_dir_tree "${FILESDIR}" || return 1
 # copy across the Doxygen-generated documentation
 for file in src/@NAME@/*
 do
-    [ "$(echo $(basename ${file})) | cut -b6)" == "build." ] && continue
+    [ "$(echo $(basename ${file}) | cut -b1-6)" == "build." ] && continue
     do_cmd cp -a ${file} ${FILESDIR} || return 1
 done
 

scripts/build.files.none/instantiate

@@ -5,7 +5,6 @@ then
 fi
 
 do_parameter_subst
-add_config_option "FILESDIR" "${COPT_FILESDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.lib.c++/config-script

@@ -90,6 +90,7 @@ done
 [ "${echo_exec_prefix}" == "yes" ] && echo "${exec_prefix}"
 [ "${echo_cflags}" == "yes" ] && echo "${dep_cflags} ${includes}"
 [ "${echo_libs}" == "yes" ] && echo "${dep_libs} -L${lib_dir} -l@NAMEMINUSL@"
+true
 
 
 

scripts/build.lib.c/config-script

@@ -90,6 +90,7 @@ done
 [ "${echo_exec_prefix}" == "yes" ] && echo "${exec_prefix}"
 [ "${echo_cflags}" == "yes" ] && echo "${dep_cflags} ${includes}"
 [ "${echo_libs}" == "yes" ] && echo "${dep_libs} -L${lib_dir} -l@NAMEMINUSL@"
+true
 
 
 

scripts/module-create.sh

@@ -93,8 +93,7 @@ COPT_CC_DEFAULT="gcc"
 COPT_CXX_DEFAULT="g++"
 COPT_CFLAGS_DEFAULT="-g -O2 -W -Wall"
 COPT_QTSTUFF_DEFAULT='-I${QTDIR}/include -L${QTDIR}/lib -lqt-mt'
-COPT_FILESDIR_DEFAULT='${PREFIX}/share/@P@/@NAME@'
-
+COPT_DOCSDIR_DEFAULT="\${PREFIX}/doc/${P}"
 
 
 if [ ! -e "src" ]