--- trunk/mage/usr/lib/mage/smage2.sh	2012/01/09 20:08:17	1614
+++ trunk/mage/usr/lib/mage/smage2.sh	2012/01/09 20:11:08	1616
@@ -431,8 +431,8 @@
 		then
 			if mqueryfeature "compressdoc"
 			then
-				cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "gzipping +installing ${doc}."
-				chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "fixing permissions of ${doc}."
+				cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."
+				chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."
 			else
 				install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."
 			fi
@@ -1407,7 +1407,13 @@
 # fixes some compile issues
 export CHOST="${CHOST}" || die "CHOST export failed"
 export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"
-export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
+if [[ -z ${CXXFLAGS} ]]
+then
+	export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
+else
+	export CXXFLAGS="${CXXFLAGS}" || die "CXXFLAGS export failed"
+fi
+export LDFLAGS="${LDFLAGS}" || die "LDFLAGS export failed"
 export BINDIR="${BINDIR}" || die "BINDIR export failed"
 export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"