--- trunk/mage-buildserver/helper/buildserver-install.sh	2019/03/15 11:30:25	3112
+++ trunk/mage-buildserver/helper/buildserver-install.sh	2019/03/19 16:12:08	3113
@@ -81,19 +81,19 @@
 	die "smagefile '${SMAGESCRIPTSDIR}/${SMAGEFILE}' not found."
 fi
 
-if [ ! -f ${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/SRC_INSTALL_DEPS ]
+if [ ! -f ${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/SRC_INSTALL_DEPS ]
 then
-	die "${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/SRC_INSTALL_DEPS missing. run 'buildserver-build-depends first"
+	die "${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/SRC_INSTALL_DEPS missing. run 'buildserver-build-depends first"
 fi
 
-SRC_INSTALL_DEPS="$(< ${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/SRC_INSTALL_DEPS)"
+SRC_INSTALL_DEPS="$(< ${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/SRC_INSTALL_DEPS)"
 
 if [[ -z ${SRC_INSTALL_DEPS} ]]
 then
 	die "buildserver-build: SRC_INSTALL_DEPS are empty, aborting."
 fi
 
-if [ -f ${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/INSTALL_OK ]
+if [ -f ${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/INSTALL_OK ]
 then
 	echo -en "Package "
 	echo -en "${COLRED}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
@@ -101,9 +101,9 @@
 	exit 3
 fi
 
-if [ ! -f ${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/INSTALLED_PREREQUISITES ]
+if [ ! -f ${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/INSTALLED_PREREQUISITES ]
 then
-	die "${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/INSTALLED_PREREQUISITES missing. run 'buildserver-build-prerequisites first"
+	die "${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/INSTALLED_PREREQUISITES missing. run 'buildserver-build-prerequisites first"
 fi
 
 #regen_mage_tree
@@ -119,11 +119,11 @@
 if install_packages ${SRC_INSTALL_DEPS} || die "installing packages"
 then
 	install_retval=0
-	echo 0 > ${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/INSTALL_OK
+	echo 0 > ${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/INSTALL_OK
 	echo "Install successfull!"
 else
 	install_retval=1
-	echo 1 > ${BUILDSERVER_CACHE_DIR}/build/${PNAME}-${PVER}-${PBUILD}/INSTALL_FAILED
+	echo 1 > ${BUILDSERVER_CACHE_DIR}/build/${PNAME}/${PNAME}-${PVER}-${PBUILD}/INSTALL_FAILED
 	echo "Installation *not* successfull!"
 fi
 if [[ ${CLEANPACKAGES} = 1 ]]