Use new `paths' system

scripts/build.app.c++-qt/build.install-app

@@ -1,11 +1,11 @@
 build_target @NAME@
 
 # make paths (this is for Gentoo in particular)
-build_dir_tree "${BINDIR}" || return 1
+build_dir_tree "${@DEST_BINDIR@}" || return 1
 
 # install binary
-echo "Installing binaries into '${BINDIR}'"
-install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
+echo "Installing binaries into '${@DEST_BINDIR@}'"
+install_file "${@CNAME@}" "${@DEST_BINDIR@}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@

scripts/build.app.c++-qt/instantiate

@@ -1,14 +1,17 @@
-if [ $# -ne 0 ]
-then
-    print_failure "Too many arguments. None required for this module."
+case "$1" in
+bin) DEST_BINDIR="BINDIR" ;;
+sbin) DEST_BINDIR="SBINDIR" ;;
+cgi) DEST_BINDIR="CGIDIR" ;;
+**)
+    echo "One argument required: binary location (bin, sbin or cgi)."
     exit 1
+    ;;
 fi
 
-do_parameter_subst
+do_parameter_subst DEST_BINDIR
 add_config_option "CXX" "${COPT_CXX_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 add_config_option "QTSTUFF" "${COPT_QTSTUFF_DEFAULT}"
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.app.c++/build.install-app

@@ -1,11 +1,11 @@
 build_target @NAME@
 
 # make paths (this is for Gentoo in particular)
-build_dir_tree "${BINDIR}" || return 1
+build_dir_tree "${@DEST_BINDIR@}" || return 1
 
 # install binary
-echo "Installing binaries into '${BINDIR}'"
-install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
+echo "Installing binaries into '${@DEST_BINDIR@}'"
+install_file "${@CNAME@}" "${@DEST_BINDIR@}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@

scripts/build.app.c++/instantiate

@@ -1,13 +1,16 @@
-if [ $# -ne 0 ]
-then
-    print_failure "Too many arguments. None required for this module."
+case "$1" in
+bin) DEST_BINDIR="BINDIR" ;;
+sbin) DEST_BINDIR="SBINDIR" ;;
+cgi) DEST_BINDIR="CGIDIR" ;;
+**)
+    echo "One argument required: binary location (bin, sbin or cgi)."
     exit 1
+    ;;
 fi
 
-do_parameter_subst
+do_parameter_subst DEST_BINDIR
 add_config_option "CXX" "${COPT_CXX_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.app.c/build.install-app

@@ -1,11 +1,11 @@
 build_target @NAME@
 
 # make paths (this is for Gentoo in particular)
-build_dir_tree "${BINDIR}" || return 1
+build_dir_tree "${@DEST_BINDIR@}" || return 1
 
 # install binary
-echo "Installing binaries into '${BINDIR}'"
-install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
+echo "Installing binaries into '${@DEST_BINDIR@}'"
+install_file "${@CNAME@}" "${@DEST_BINDIR@}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@

scripts/build.app.c/instantiate

@@ -1,13 +1,16 @@
-if [ $# -ne 0 ]
-then
-    print_failure "Too many arguments. None required for this module."
+case "$1" in
+bin) DEST_BINDIR="BINDIR" ;;
+sbin) DEST_BINDIR="SBINDIR" ;;
+cgi) DEST_BINDIR="CGIDIR" ;;
+**)
+    echo "One argument required: binary location (bin, sbin or cgi)."
     exit 1
+    ;;
 fi
 
-do_parameter_subst
+do_parameter_subst DEST_BINDIR
 add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.app.sh/build.install-app

@@ -1,11 +1,11 @@
 # make paths (this is for Gentoo in particular)
-build_dir_tree "${BINDIR}" || return 1
+build_dir_tree "${@DEST_BINDIR@}" || return 1
 
 # install binary
-echo "Installing binaries into '${BINDIR}'"
+echo "Installing binaries into '${@DEST_BINDIR@}'"
 for script in src/@NAME@/*.sh
 do
-	install_file "${script}" "${BINDIR}" 0755 || return 1
+	install_file "${script}" "${@DEST_BINDIR@}" 0755 || return 1
 done
 print_success "Done"
 

scripts/build.app.sh/instantiate

@@ -1,11 +1,14 @@
-if [ $# -ne 0 ]
-then
-    print_failure "Too many arguments. None required for this module."
+case "$1" in
+bin) DEST_BINDIR="BINDIR" ;;
+sbin) DEST_BINDIR="SBINDIR" ;;
+cgi) DEST_BINDIR="CGIDIR" ;;
+**)
+    echo "One argument required: binary location (bin, sbin or cgi)."
     exit 1
+    ;;
 fi
 
-do_parameter_subst
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
+do_parameter_subst DEST_BINDIR
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.docs.doxygen/instantiate

@@ -5,7 +5,6 @@ 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.docs.none/instantiate

@@ -5,7 +5,6 @@ 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.firmware.gpasm/instantiate

@@ -5,7 +5,7 @@ then
 fi
 
 do_parameter_subst
-add_config_option "HEXDIR" "${COPT_HEXDIR_DEFAULT}"
+add_config_option "HEXDIR" "\${SHAREDIR}/@TODO@"
 add_config_option "GPASM" "gpasm"
 add_config_option "GPASM_FLAGS" ""
 true

scripts/build.firmware.sdcc/instantiate

@@ -5,7 +5,7 @@ then
 fi
 
 do_parameter_subst
-add_config_option "HEXDIR" "${COPT_HEXDIR_DEFAULT}"
+add_config_option "HEXDIR" "\${SHAREDIR}/@TODO@"
 add_config_option "SDCC" "sdcc"
 add_config_option "SDCCFLAGS" ""
 true

scripts/build.lib.c++/build.install-lib

@@ -27,8 +27,8 @@ CONFFILE="${INSTALL_PREFIX}${BINDIR}/@NAME@-config"
 do_cmd rm -f "${CONFFILE}"
 do_cmd_redir "${CONFFILE}" sed \
     -e "s,@VERSION@,${VERSION}," \
-    -e "s,@LIB_DIR@,${FINALLIBDIR}," \
-    -e "s,@INCLUDE_DIR@,${FINALINCLUDEDIR}," \
+    -e "s,@LIB_DIR@,${LIBDIR}," \
+    -e "s,@INCLUDE_DIR@,${INCLUDEDIR}," \
     -e "s,@DEP_CFLAGS@,${@CNAME@_DEP_CFLAGS}," \
     -e "s,@DEP_LIBS@,${@CNAME@_DEP_LIBS}," \
     src/@NAME@/config-script

scripts/build.lib.c++/instantiate

@@ -20,11 +20,6 @@ fi
 do_parameter_subst NAMEMINUSL HEADER_NAME
 add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
-add_config_option "LIBDIR" "${COPT_LIBDIR_DEFAULT}"
-add_config_option "INCLUDEDIR" "${COPT_INCLUDEDIR_DEFAULT}"
-add_config_option "FINALLIBDIR" "${COPT_FINALLIBDIR_DEFAULT}"
-add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.lib.c/build.install-lib

@@ -29,8 +29,8 @@ do_cmd_redir "${CONFFILE}" sed \
     -e "s,@VERSION@,${VERSION}," \
     -e "s,@DEP_CFLAGS@,${@CNAME@_DEP_CFLAGS}," \
     -e "s,@DEP_LIBS@,${@CNAME@_DEP_LIBS}," \
-    -e "s,@LIB_DIR@,${FINALLIBDIR}," \
-    -e "s,@INCLUDE_DIR@,${FINALINCLUDEDIR}," \
+    -e "s,@LIB_DIR@,${LIBDIR}," \
+    -e "s,@INCLUDE_DIR@,${INCLUDEDIR}," \
     src/@NAME@/config-script
 
 do_cmd chmod 0755 "${CONFFILE}"

scripts/build.lib.c/instantiate

@@ -20,11 +20,6 @@ fi
 do_parameter_subst NAMEMINUSL HEADER_NAME
 add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
-add_config_option "LIBDIR" "${COPT_LIBDIR_DEFAULT}"
-add_config_option "INCLUDEDIR" "${COPT_INCLUDEDIR_DEFAULT}"
-add_config_option "FINALLIBDIR" "${COPT_FINALLIBDIR_DEFAULT}"
-add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.make.none/instantiate

@@ -7,11 +7,6 @@ fi
 do_parameter_subst
 add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
-add_config_option "LIBDIR" "${COPT_LIBDIR_DEFAULT}"
-add_config_option "INCLUDEDIR" "${COPT_INCLUDEDIR_DEFAULT}"
-add_config_option "FINALLIBDIR" "${COPT_FINALLIBDIR_DEFAULT}"
-add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/build.module.c/instantiate

@@ -7,8 +7,7 @@ fi
 do_parameter_subst
 add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
-add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
-add_config_option "MODULEDIR" "${COPT_LIBDIR_DEFAULT}/@TODO@/"
+add_config_option "MODULEDIR" "\${LIBDIR}/@TODO@/"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

scripts/module-create.sh

@@ -83,17 +83,10 @@ add_config_option() {
     # add the default line
     echo "[ -z \"\${$1}\" ] && $1=\"$2\"" >> ../../config
 }
-COPT_BINDIR_DEFAULT='${PREFIX}/bin'
-COPT_LIBDIR_DEFAULT='${PREFIX}/lib'
-COPT_HEXDIR_DEFAULT='${PREFIX}/hexdir'
-COPT_INCLUDEDIR_DEFAULT='${PREFIX}/include'
-COPT_FINALLIBDIR_DEFAULT='${LIBDIR}'
-COPT_FINALINCLUDEDIR_DEFAULT='${INCLUDEDIR}'
 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" ]