Changeset 920 in MondoRescue

Timestamp:

Nov 4, 2006, 12:38:25 AM (17 years ago)

Author:

Bruno Cornec

Message:

Now uses rpmquery for macro expansion in rpm

File:

• branches/stable/tools/distro-env (modified) (1 diff)

branches/stable/tools/distro-env

@@ -121 +121 @@
 
 # Default
-export TOPBUILDDIR=`rpm --showrc | grep -E '[   ]_topdir[   ]' | awk '{print $3}'`
+export TOPBUILDDIR=${TOPDIR}/../build
 
 if [ _"$dtype" = _"rpm" ]; then
+    export TOPBUILDDIR=`rpmquery -E '%{_topdir}' 2> /dev/null`
     export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
-    if [ -f ${HOME}/.rpmmacros ]; then
-        _TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
-        if [ _"$_TOPBUILDDIR" != _"" ]; then
-            export TOPBUILDDIR=$_TOPBUILDDIR
-        fi
-    fi
     mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
     if [ $? -ne 0 ]; then