- fallback to ~/rpm/{RPMS,SRPMS,BUILD} of they don't exist in topdir (old mode)

Changed files:
    rpm.macros -> 1.543

diff --git a/rpm.macros b/rpm.macros
index 648a95450817cf5b04dfbb95a405566044caab05..079dbb5088caeaf312ea169def2a660b977e246b 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -88,9 +88,9 @@
 # BUILD/RPMS/SRPMS are one same level by default as packages dir, if these exist
 # if they don't exist assume we are having custom topdir (which is not named as
 # "packages", i.e ~/rpm/kde/{kdelibs,BUILD/RPMS/SRPMS})
-%_builddir             %{expand:%%global _builddir %(if [ -d %{_topdir}/../BUILD ]; then readlink -m %{_topdir}/../BUILD; else echo %{_topdir}/BUILD; fi)}%_builddir
-%_rpmdir               %{expand:%%global _rpmdir %(if [ -d %{_topdir}/../RPMS ]; then readlink -m %{_topdir}/../RPMS; else echo %{_topdir}/RPMS; fi)}%_rpmdir
-%_srcrpmdir            %{expand:%%global _srcrpmdir %(if [ -d %{_topdir}/../SRPMS ]; then readlink -m %{_topdir}/../SRPMS; else echo %{_topdir}/SRPMS; fi)}%_srcrpmdir
+%_builddir             %{expand:%%global _builddir %(if [ -d %{_topdir}/BUILD ]; then echo %{_topdir}/BUILD; else readlink -m %{_topdir}/../BUILD; fi)}%_builddir
+%_rpmdir               %{expand:%%global _rpmdir %(if [ -d %{_topdir}/RPMS ]; then echo %{_topdir}/RPMS; else readlink -m %{_topdir}/../RPMS; fi)}%_rpmdir
+%_srcrpmdir            %{expand:%%global _srcrpmdir %(if [ -d %{_topdir}/SRPMS ]; then echo %{_topdir}/SRPMS; else readlink -m %{_topdir}/../SRPMS; fi)}%_srcrpmdir
 
 #      The number of cvs changelog entries kept when building package.
 %_buildchangelogtruncate 20