From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sat, 13 Feb 2010 19:11:57 +0000 (+0000)
Subject: - fix for ../builder being dir (if your LOGIN=builder ;P)
X-Git-Tag: auto/th/rpm-build-macros-1_536-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-macros.git;a=commitdiff_plain;h=d5617d26402d33266f8fe7db454b62387a312fba

- 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 ed2612d..dabcdf5 100644
--- 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