--- trunk/mage/usr/lib/mage/generate_meta_data.sh	2012/01/13 18:31:48	1641
+++ trunk/mage/usr/lib/mage/generate_meta_data.sh	2012/01/13 18:37:52	1642
@@ -1,9 +1,12 @@
 #!/bin/bash
 # generate metadata files for packages - called after smage2 has done packaging
 
+: ${MAGERC="/etc/mage.rc"}
+
 source /etc/mage.rc.global
-source /etc/mage.rc
-source /usr/lib/mage/mage4.functions.sh
+source ${MAGERC}
+source ${MLIBDIR}/mage4.functions.sh
+source ${MLIBDIR}/smage2.functions.sh
 
 die()
 {
@@ -15,7 +18,7 @@
 SMAGEFILE="$1"
 METADIR=/var/cache/mage/meta
 
-source $1
+smagesource ${SMAGEFILE}
 
 DEST="${METADIR}/${PNAME}/${PNAME}-${PVER}-${PBUILD}"
 
@@ -24,7 +27,7 @@
 
 # basic meta data
 echo "${PNAME}" > ${DEST}/meta
-echo "${PCATEGORIE}" >> ${DEST}/meta
+echo "${PCAT}" >> ${DEST}/meta
 echo "${PVER}" >> ${DEST}/meta
 echo "${PBUILD/r/}" >> ${DEST}/meta
 echo "${STATE}" >> ${DEST}/meta