fixed quoting

diff --git a/eclass/gnat.eclass b/eclass/gnat.eclass
index 2ffaa464571652f5e5e04cd3ce53f28deef342e3..9dbd439536958853ad6895e87c954a860fabbdb0 100644 (file)
--- a/eclass/gnat.eclass
+++ b/eclass/gnat.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.33 2008/01/06 19:30:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.34 2008/02/13 20:09:27 george Exp $
 #
 # Author: George Shapovalov <george@gentoo.org>
 # Belongs to: ada herd <ada@gentoo.org>
@@ -423,10 +423,10 @@ gnat_src_install() {
                                cp -dpR "${DLbin}-${compilers[${i}]}" "${D}/${DLlocation}"/bin
                                cp -dpR "${DLgpr}-${compilers[${i}]}" "${D}/${DLlocation}"/gpr
                                # create profile-specific specs file
-                               cp ${LibEnv} ${D}/${SPECSDIR}/${PN}/${compilers[${i}]}
-                               sed -i -e "s:%DL%:${DLlocation}/${PN}:g" ${D}/${SPECSDIR}/${PN}/${compilers[${i}]}
-                               sed -i -e "s:%DLbin%:${DLlocation}/bin:g" ${D}/${SPECSDIR}/${PN}/${compilers[${i}]}
-                               sed -i -e "s:%DLgpr%:${DLlocation}/gpr:g" ${D}/${SPECSDIR}/${PN}/${compilers[${i}]}
+                               cp ${LibEnv} "${D}/${SPECSDIR}/${PN}/${compilers[${i}]}"
+                               sed -i -e "s:%DL%:${DLlocation}/${PN}:g" "${D}/${SPECSDIR}/${PN}/${compilers[${i}]}"
+                               sed -i -e "s:%DLbin%:${DLlocation}/bin:g" "${D}/${SPECSDIR}/${PN}/${compilers[${i}]}"
+                               sed -i -e "s:%DLgpr%:${DLlocation}/gpr:g" "${D}/${SPECSDIR}/${PN}/${compilers[${i}]}"
                        else
                                einfo "skipping gnat profile ${compilers[${i}]}"
                        fi

diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
index 3f5afb9f0f71660084a537e0a832c9009627e7da..b8df9a79b0bbb6179c0431ee13f557c30d055516 100644 (file)
--- a/eclass/gnatbuild.eclass
+++ b/eclass/gnatbuild.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.36 2008/02/11 15:12:31 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.37 2008/02/13 20:12:17 george Exp $
 #
 # Author: George Shapovalov <george@gentoo.org>
 # Belongs to: ada herd <ada@gentoo.org>
@@ -317,7 +317,7 @@ gnatbuild_src_unpack() {
                        unpack ${A}
                        pax-mark E $(find ${GNATBOOT} -name gnat1)
 
-                       cd ${S}
+                       cd "${S}"
                        # patching gcc sources, following the toolchain
                        if [[ -d "${FILESDIR}"/${SLOT} ]] ; then
                                EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
@@ -346,7 +346,7 @@ gnatbuild_src_unpack() {
                        done
 
                        # regenerate some configures tp fix ACT's omissions
-                       pushd ${S}/gnattools &> /dev/null
+                       pushd "${S}"/gnattools &> /dev/null
                                eautoconf
                        popd &> /dev/null
                ;;
@@ -364,7 +364,7 @@ gnatbuild_src_unpack() {
                        # add -fPIC flag to shared libs for 3.4* backend
                        if [ "3.4" == "${GCCBRANCH}" ] ; then
                                cd ada
-                               epatch ${FILESDIR}/gnat-Make-lang.in.patch
+                               epatch "${FILESDIR}"/gnat-Make-lang.in.patch
                        fi
 
                        mkdir -p "${GNATBUILD}"
@@ -476,10 +476,10 @@ gnatbuild_src_compile() {
                                debug-print-section make-tools
                                # Compile helper tools
                                cd "${GNATBOOT}"
-                               cp ${S}/gcc/ada/xtreeprs.adb .
-                               cp ${S}/gcc/ada/xsinfo.adb .
-                               cp ${S}/gcc/ada/xeinfo.adb .
-                               cp ${S}/gcc/ada/xnmake.adb .
+                               cp "${S}"/gcc/ada/xtreeprs.adb .
+                               cp "${S}"/gcc/ada/xsinfo.adb .
+                               cp "${S}"/gcc/ada/xeinfo.adb .
+                               cp "${S}"/gcc/ada/xnmake.adb .
                                gnatmake xtreeprs && \
                                        gnatmake xsinfo && \
                                        gnatmake xeinfo && \
@@ -562,7 +562,7 @@ gnatbuild_src_install() {
 
 
                cd "${GNATBUILD}"
-               make DESTDIR=${D} install || die
+               make DESTDIR="${D}" install || die
 
                #make a convenience info link
                dosym ${DATAPATH}/info/gnat_ugn_unw.info ${DATAPATH}/info/gnat.info