- fix for ../builder being dir (if your LOGIN=builder ;P)

Changed files:
    rpm.macros -> 1.536

diff --git a/rpm.macros b/rpm.macros
index ed2612d11c554b441631a66245700f23a308dbb7..dabcdf5162c8aba2d21e4117311ab30152d43dd7 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -58,8 +58,8 @@
 # SPECS/SOURCES dirs exist (XXX: should be reverse?)
 %_topdir    %{expand:%%global _topdir %(d=;\
     d=${d:-$([ -d ../SPECS -a -d ../SOURCES ] && (cd .. && pwd))};\
-    d=${d:-$([ -x ../builder ] && (cd ..; pwd))};\
-    d=${d:-$([ -x builder ] && pwd)};\
+    d=${d:-$([ -x ../builder -a ! -d ../builder ] && (cd ..; pwd))};\
+    d=${d:-$([ -x builder -a ! -d builder ] && pwd)};\
     echo ${d:-$HOME/rpm};\
 )}%_topdir