--- /tmp/installer.sh	2007-07-22 14:40:17.000000000 +0300
+++ rkhunter-1.3.0/installer.sh	2007-08-01 16:43:56.000000000 +0300
@@ -153,12 +153,7 @@ case "$1" in
 						;;
 				esac
 				;;
-			RPM)	if [ -n "${RPM_BUILD_ROOT}" ]; then
-					PREFIX="${RPM_BUILD_ROOT}/usr/local"
-				else
-					echo "RPM prefix chosen but \$RPM_BUILD_ROOT variable not found, exiting."
-					exit 1
-				fi
+			RPM)	echo "${PREFIX}";	
 				;;
 			*)	PREFIX="$1"
 				;;
@@ -180,7 +175,7 @@ case "$1" in
 			/usr/local|custom_*)
 				SYSCONFIGDIR="${PREFIX}/etc"
 				;;
-			RPM)	SYSCONFIGDIR="${RPM_BUILD_ROOT}/etc"
+			RPM)	
 				;;
 			*)	SYSCONFIGDIR="/etc"
 				;;
@@ -195,13 +190,7 @@ case "$1" in
 				VARDIR="${PREFIX}/var"
 				SHAREDIR="${PREFIX}/share"; BINDIR="${PREFIX}/bin"
 				;;
-			RPM)	if [ "`uname -m`" = "x86_64" ]; then
-					LIBDIR="${PREFIX}/lib64"
-				else
-					LIBDIR="${PREFIX}/lib"
-				fi
-				VARDIR="${RPM_BUILD_ROOT}/var"
-				SHAREDIR="${PREFIX}/share"; BINDIR="${PREFIX}/bin"
+			RPM)
 				;;
 			*)
 				if [ -d "${PREFIX}/lib64" ]; then
@@ -227,18 +216,32 @@ esac
 RKHINST_ETC_DIR="${SYSCONFIGDIR}"
 RKHINST_BIN_DIR="${BINDIR}"
 RKHINST_SCRIPT_DIR="${LIBDIR}/${APPNAME}/scripts"
+RKHINST_MAN_DIR="${SHAREDIR}/man/man8"
 
 if [ "${RKHINST_LAYOUT}" = "oldschool" ]; then
 	RKHINST_DB_DIR="${VARDIR}/${APPNAME}/db"
 	RKHINST_TMP_DIR="${VARDIR}/${APPNAME}/tmp"
 	RKHINST_DOC_DIR="${SHAREDIR}/${APPNAME}/docs"
+elif [ "${RKHINST_LAYOUT}" = "RPM" ]; then
+#	LIBDIR="${PREFIX}"/"${LIBDIR}"
+#	SHAREDIR="${PREFIX}"/"${SHAREDIR}"	
+#	VARDIR="${PREFIX}"/"${VARDIR}"
+#	BINDIR="${PREFIX}"/"${BINDIR}"
+#	SYSCONFIGDIR="${PREFIX}i"/"${SYSCONFIGDIR}"
+#	RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}-${APPVERSION}"
+	RKHINST_ETC_DIR="${PREFIX}/${SYSCONFIGDIR}"
+	RKHINST_BIN_DIR="${PREFIX}/${BINDIR}"
+	RKHINST_DB_DIR="${PREFIX}/${VARDIR}/lib/${APPNAME}/db"
+	RKHINST_TMP_DIR="${PREFIX}/${VARDIR}/lib/${APPNAME}/tmp"
+	RKHINST_DOC_DIR="${PREFIX}/${SHAREDIR}/doc/${APPNAME}-${APPVERSION}"
+	RKHINST_SCRIPT_DIR="${PREFIX}/${LIBDIR}/${APPNAME}/scripts"
+	RKHINST_MAN_DIR="${PREFIX}/${SHAREDIR}/man/man8"
 else
 	RKHINST_DB_DIR="${VARDIR}/lib/${APPNAME}/db"
 	RKHINST_TMP_DIR="${VARDIR}/lib/${APPNAME}/tmp"
 	RKHINST_DOC_DIR="${SHAREDIR}/doc/${APPNAME}-${APPVERSION}"
 fi
 
-RKHINST_MAN_DIR="${SHAREDIR}/man/man8"
 RKHINST_LANG_DIR="${RKHINST_DB_DIR}/i18n"
 
 RKHINST_ETC_FILE="${APPNAME}.conf"
@@ -575,7 +578,7 @@ for FILE in ${RKHINST_ETC_FILE}; do
 
 		echo "" >> "${RKHINST_ETC_DIR}/${FILE}"
 		if [ -n "${RPM_BUILD_ROOT}" ]; then
-			echo "INSTALLDIR=${PREFIX}" | sed "s|${RPM_BUILD_ROOT}||g" >> "${RKHINST_ETC_DIR}/${FILE}"
+			echo "INSTALLDIR=${PREFIX}/" | sed "s|${RPM_BUILD_ROOT}||g" >> "${RKHINST_ETC_DIR}/${FILE}"
 			echo "DBDIR=${RKHINST_DB_DIR}" | sed "s|${RPM_BUILD_ROOT}||g" >> "${RKHINST_ETC_DIR}/${FILE}"
 			echo "SCRIPTDIR=${RKHINST_SCRIPT_DIR}" | sed "s|${RPM_BUILD_ROOT}||g" >> "${RKHINST_ETC_DIR}/${FILE}"
 			echo "TMPDIR=${RKHINST_TMP_DIR}" | sed "s|${RPM_BUILD_ROOT}||g" >> "${RKHINST_ETC_DIR}/${FILE}"