packages: rpm-build-macros/rpm.macros - fix for ../builder being dir (if yo...

glen glen at pld-linux.org
Sat Feb 13 20:12:02 CET 2010


Author: glen                         Date: Sat Feb 13 19:12:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for ../builder being dir (if your LOGIN=builder ;P)

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.535 -> 1.536) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.535 packages/rpm-build-macros/rpm.macros:1.536
--- packages/rpm-build-macros/rpm.macros:1.535	Sat Feb 13 19:04:03 2010
+++ packages/rpm-build-macros/rpm.macros	Sat Feb 13 20:11:57 2010
@@ -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
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.535&r2=1.536&f=u



More information about the pld-cvs-commit mailing list