--- trunk/core/include/haskell.sminc	2010/07/02 08:18:49	5571
+++ trunk/core/include/haskell.sminc	2010/07/02 13:40:50	5578
@@ -4,9 +4,10 @@
 sminclude mtools
 
 # some sane default values
+: ${HASKELL_PACKAGE="${PNAME/#haskell-/}"}
 : ${PCATEGORIE="dev-haskell"}
 : ${DESCRIPTION="${PNAME}"}
-: ${HOMEPAGE="http://hackage.haskell.org/package/${PNAME/#haskell-/}"}
+: ${HOMEPAGE="http://hackage.haskell.org/package/${HASKELL_PACKAGE}"}
 
 # some sane default dependencies
 # all packages with haskell in the name needs ghc as runtime
@@ -20,11 +21,11 @@
 	>= dev-lang/ghc-6.12"
 
 # default SRCFILE SRCDIR and SRC_URI
-: ${SRCFILE="${PNAME/#haskell-/}-${PVER}.tar.gz"}
-: ${SRCDIR="${BUILDDIR}/${PNAME/#haskell-/}-${PVER}"}
+: ${SRCFILE="${HASKELL_PACKAGE}-${PVER}.tar.gz"}
+: ${SRCDIR="${BUILDDIR}/${HASKELL_PACKAGE}-${PVER}"}
 SRC_URI=(
 	${SRC_URI[*]}
-	http://hackage.haskell.org/packages/archive/${PNAME/#haskell-/}/${PVER}/${SRCFILE}
+	http://hackage.haskell.org/packages/archive/${HASKELL_PACKAGE}/${PVER}/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 )
 
@@ -130,9 +131,9 @@
 		--ghc \
 		--prefix=/usr \
 		--libdir=/usr/$(mlibdir) \
-		--libsubdir=ghc-$(haskell_ghc_version)/${PNAME/#haskell-/}-${PVER} \
+		--libsubdir=ghc-$(haskell_ghc_version)/${HASKELL_PACKAGE}-${PVER} \
 		--datadir=/usr/share \
-		--datasubdir=ghc-$(haskell_ghc_version)/${PNAME/#haskell-/}-${PVER} \
+		--datasubdir=ghc-$(haskell_ghc_version)/${HASKELL_PACKAGE}-${PVER} \
 		${configure_opts} \
 		|| die
 }