From 91c908262436af286d9f0d1fb2247d8d3b3b6ee6 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@amethyst.(none)>
Date: Tue, 5 Feb 2008 21:07:25 +0000
Subject: [PATCH] Use more flexible scheme in assignment of default directories

---
 skel/scripts/paths | 113 ++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 68 deletions(-)

diff --git a/skel/scripts/paths b/skel/scripts/paths
index 46fde55..4c0d24e 100644
--- a/skel/scripts/paths
+++ b/skel/scripts/paths
@@ -8,79 +8,56 @@
 #  to override values if needed.
 #
 
-# build proposed paths
-case "${PREFIX}" in
-/)
-    MY_BINDIR="/bin"
-    MY_SBINDIR="/sbin"
-    MY_LIBDIR="/lib"
-    MY_INCLUDEDIR="/usr/include"
-    MY_CONFIGDIR="/etc"
-    MY_VARDIR="/var"
-    MY_SHAREDIR="/usr/share/@P@"
-    MY_DOCSDIR="/usr/share/doc/@P@"
-    MY_WEBDIR="/srv/http"
-    ;;
+MY_PREFIX="${PREFIX}"
+[ "${MY_PREFIX}" == "/" ] && MY_PREFIX=""
 
-/usr)
-    MY_BINDIR="/usr/bin"
-    MY_SBINDIR="/usr/sbin"
-    MY_LIBDIR="/usr/lib"
-    MY_INCLUDEDIR="/usr/include"
-    MY_CONFIGDIR="/etc"
-    MY_VARDIR="/var"
-    MY_SHAREDIR="/usr/share/@P@"
-    MY_DOCSDIR="/usr/share/doc/@P@"
-    MY_WEBDIR="/srv/http"
-    ;;
+[ -z "${BINDIR}" ] && BINDIR="${PREFIX}/bin"
+[ -z "${SBINDIR}" ] && SBINDIR="${PREFIX}/sbin"
+[ -z "${LIBDIR}" ] && LIBDIR="${PREFIX}/lib"
 
-/usr/local)
-    MY_BINDIR="/usr/local/bin"
-    MY_SBINDIR="/usr/local/sbin"
-    MY_LIBDIR="/usr/local/lib"
-    MY_INCLUDEDIR="/usr/local/include"
-    MY_CONFIGDIR="/usr/local/etc"
-    MY_VARDIR="/var"
-    MY_SHAREDIR="/usr/local/share/@P@"
-    MY_DOCSDIR="/usr/local/share/doc/@P@"
-    MY_WEBDIR="/srv/http"
-    ;;
+if [ -z "${INCLUDEDIR}" ]
+then
+    case "${PREFIX}" in
+    /) INCLUDEDIR="/usr/include" ;;
+    *) INCLUDEDIR="${PREFIX}/include" ;;
+    esac
+fi
 
-/opt/*)
-    MY_BINDIR="${PREFIX}/bin"
-    MY_SBINDIR="${PREFIX}/sbin"
-    MY_LIBDIR="${PREFIX}/lib"
-    MY_INCLUDEDIR="${PREFIX}/include"
-    MY_CONFIGDIR="/etc${PREFIX}"
-    MY_VARDIR="/var${PREFIX}"
-    MY_SHAREDIR="/var${PREFIX}"
-    MY_DOCSDIR="${PREFIX}/doc"
-    MY_WEBDIR="${PREFIX}/http"
-    ;;
+if [ -z "${CONFIGDIR}" ]
+then
+    case "${PREFIX}" in
+    / | /usr) CONFIGDIR="/etc" ;;
+    /opt*) CONFIGDIR="/etc${PREFIX}" ;;
+    *) CONFIGDIR="${PREFIX}/etc" ;;
+    esac
+fi
 
-**)
-    MY_BINDIR="${PREFIX}/bin"
-    MY_SBINDIR="${PREFIX}/sbin"
-    MY_LIBDIR="${PREFIX}/lib"
-    MY_INCLUDEDIR="${PREFIX}/include"
-    MY_CONFIGDIR="${PREFIX}/etc"
-    MY_VARDIR="${PREFIX}/var"
-    MY_SHAREDIR="${PREFIX}/share"
-    MY_DOCSDIR="${PREFIX}/share/doc"
-    MY_WEBDIR="${PREFIX}/srv/http"
-    ;;
-esac
+if [ -z "${VARDIR}" ]
+then
+    case "${PREFIX}" in
+    / | /usr | /usr/local) VARDIR="/var" ;;
+    /opt*) VARDIR="/var${PREFIX}" ;;
+    *) VARDIR="${PREFIX}/var" ;;
+    esac
+fi
 
-# assign paths allowing user to override
-[ -z "${BINDIR}" ] && BINDIR="${MY_BINDIR}"
-[ -z "${SBINDIR}" ] && SBINDIR="${MY_SBINDIR}"
-[ -z "${LIBDIR}" ] && LIBDIR="${MY_LIBDIR}"
-[ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${MY_INCLUDEDIR}"
-[ -z "${CONFIGDIR}" ] && CONFIGDIR="${MY_CONFIGDIR}"
-[ -z "${VARDIR}" ] && VARDIR="${MY_VARDIR}"
-[ -z "${SHAREDIR}" ] && SHAREDIR="${MY_SHAREDIR}"
-[ -z "${DOCSDIR}" ] && DOCSDIR="${MY_DOCSDIR}"
-[ -z "${WEBDIR}" ] && WEBDIR="${MY_WEBDIR}"
+if [ -z "${SHAREDIR}" ]
+then
+    case "${PREFIX}" in
+    /) SHAREDIR="/usr/share" ;;
+    *) SHAREDIR="${PREFIX}/share" ;;
+    esac
+fi
+[ -z "${DOCSDIR}" ] && DOCSDIR="${SHAREDIR}/doc"
+
+if [ -z "${SRVDIR}" ]
+then
+    case "${PREFIX}" in
+    / | /usr | /usr/local) SRVDIR="/srv" ;;
+    *) SRVDIR="${PREFIX}/srv" ;;
+    esac
+fi
+[ -z "${WEBDIR}" ] && WEBDIR="${SRVDIR}/http"
 [ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin"
  
 # kate: @KATE_MODELINE@