From b6e0f0dc02c89256bbb73acd051b687b09b4c6e9 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Tue, 12 Dec 2006 15:39:47 +0000
Subject: [PATCH 1/3] Fix typo in FINALINCLUDEDIR default value

---
 scripts/module-create.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/module-create.sh b/scripts/module-create.sh
index bcad7ec..aec91db 100755
--- a/scripts/module-create.sh
+++ b/scripts/module-create.sh
@@ -85,10 +85,10 @@ add_config_option() {
 }
 COPT_BINDIR_DEFAULT='${PREFIX}/bin'
 COPT_LIBDIR_DEFAULT='${PREFIX}/lib'
-COPT_HEXDIR_DEFAULT="hexdir"
+COPT_HEXDIR_DEFAULT='${PREFIX}/hexdir'
 COPT_INCLUDEDIR_DEFAULT='${PREFIX}/include'
 COPT_FINALLIBDIR_DEFAULT='${LIBDIR}'
-COPT_FINALLINCLUDEDIR_DEFAULT='${INCLUDEDIR}'
+COPT_FINALINCLUDEDIR_DEFAULT='${INCLUDEDIR}'
 COPT_CC_DEFAULT="gcc"
 COPT_CXX_DEFAULT="g++"
 COPT_CFLAGS_DEFAULT="-g -O2 -W -Wall"

From 4b6457479b91b47156305ff11399cd525889f8e6 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Tue, 12 Dec 2006 16:15:27 +0000
Subject: [PATCH 2/3] Don't fail the script if the last command in config
 returns false

---
 skel/make.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/skel/make.sh b/skel/make.sh
index 2aa6af1..359be2f 100755
--- a/skel/make.sh
+++ b/skel/make.sh
@@ -10,7 +10,12 @@
 # This file is the script used to build @P@. There are some
 # options that can be edited; these are set in the file 'config' (or you
 # can pass them in as environment variables).
-source config || exit 1
+if [ ! -e "config" ]
+then
+    echo "Configuration file not found???"
+    exit 1
+fi
+source "config" # don't fail on error, since last command in config might return false
 
 
 
@@ -256,6 +261,7 @@ do
         echo "Cleaning..."
         rm -rf ${OUTPUT_DIRS}
         print_success "Done"
+	true
     ;;
 
     # bad Kdevelop! bad!

From 28f36feef4f36af2bfb79d0975c34ea654288364 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.guralp.local>
Date: Tue, 12 Dec 2006 16:17:22 +0000
Subject: [PATCH 3/3] Remove stray tab

---
 skel/make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skel/make.sh b/skel/make.sh
index 359be2f..47a4210 100755
--- a/skel/make.sh
+++ b/skel/make.sh
@@ -261,7 +261,7 @@ do
         echo "Cleaning..."
         rm -rf ${OUTPUT_DIRS}
         print_success "Done"
-	true
+        true
     ;;
 
     # bad Kdevelop! bad!