From 26cbe17fea66775c34a4a257d7c9f36333e61870 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@amethyst.lan>
Date: Wed, 13 Dec 2006 22:13:20 +0000
Subject: [PATCH 1/6] Always make the config script return true

---
 scripts/build.lib.c++/config-script | 1 +
 scripts/build.lib.c/config-script   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/build.lib.c++/config-script b/scripts/build.lib.c++/config-script
index 714f54c..39b7ba6 100644
--- a/scripts/build.lib.c++/config-script
+++ b/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
 
 
 
diff --git a/scripts/build.lib.c/config-script b/scripts/build.lib.c/config-script
index 714f54c..39b7ba6 100644
--- a/scripts/build.lib.c/config-script
+++ b/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
 
 
 

From 6a91c5d603ae661acc5006dafa8dd30276f36adc Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Fri, 15 Dec 2006 10:30:04 +0000
Subject: [PATCH 2/6] Fix detection of "build.*" in file install script

---
 scripts/build.files.none/build.install-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.files.none/build.install-files b/scripts/build.files.none/build.install-files
index 1920946..946c9fc 100644
--- a/scripts/build.files.none/build.install-files
+++ b/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
 

From b42bbd0e98caa1262a5c0b8d4d7fc263614f8241 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Fri, 15 Dec 2006 10:33:26 +0000
Subject: [PATCH 3/6] Fix another typo

---
 scripts/build.files.none/build.install-files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.files.none/build.install-files b/scripts/build.files.none/build.install-files
index 946c9fc..dd8242e 100644
--- a/scripts/build.files.none/build.install-files
+++ b/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 -b1-6)" == "build." ] && continue
+    [ "$(echo $(basename ${file}) | cut -b1-6)" == "build." ] && continue
     do_cmd cp -a ${file} ${FILESDIR} || return 1
 done
 

From d549a21d783875c3417fb11fbe4d2866baff5b29 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Tue, 2 Jan 2007 10:44:09 +0000
Subject: [PATCH 4/6] Don't add FILESDIR to config; it's not necessary

---
 scripts/build.files.none/instantiate | 1 -
 scripts/module-create.sh             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/scripts/build.files.none/instantiate b/scripts/build.files.none/instantiate
index c85388a..9fb90de 100644
--- a/scripts/build.files.none/instantiate
+++ b/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;
diff --git a/scripts/module-create.sh b/scripts/module-create.sh
index aec91db..8e1e0f9 100755
--- a/scripts/module-create.sh
+++ b/scripts/module-create.sh
@@ -93,7 +93,6 @@ 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@'
 
 
 

From b2295cd9079d30e82f79e1a22ddcfa21fa1640bf Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Tue, 2 Jan 2007 10:44:41 +0000
Subject: [PATCH 5/6] Remove unnecessary executable flag.

---
 skel/config | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 skel/config

diff --git a/skel/config b/skel/config
old mode 100755
new mode 100644

From f5e3be481b08b95b25f50a6760a801383ab2ef30 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Tue, 2 Jan 2007 10:47:16 +0000
Subject: [PATCH 6/6] Add config option for DOCSDIR

---
 scripts/build.docs.doxygen/instantiate | 1 +
 scripts/module-create.sh               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/build.docs.doxygen/instantiate b/scripts/build.docs.doxygen/instantiate
index 9fb90de..5c0eb7c 100644
--- a/scripts/build.docs.doxygen/instantiate
+++ b/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;
diff --git a/scripts/module-create.sh b/scripts/module-create.sh
index 8e1e0f9..ee3c074 100755
--- a/scripts/module-create.sh
+++ b/scripts/module-create.sh
@@ -93,7 +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_DOCSDIR_DEFAULT="\${PREFIX}/doc/${P}"
 
 
 if [ ! -e "src" ]