SOURCES: rpm.macros - handle missing binaries

[glen]

Author: glen                         Date: Thu Mar 13 23:30:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- handle missing binaries

---- Files affected:
SOURCES:
   rpm.macros (1.441 -> 1.442) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.441 SOURCES/rpm.macros:1.442
--- SOURCES/rpm.macros:1.441	Fri Mar 14 00:25:38 2008
+++ SOURCES/rpm.macros	Fri Mar 14 00:30:52 2008
@@ -219,10 +219,10 @@
 %{nil}
 
 # Location of autoconf macros
-%_aclocaldir	%{expand:%%global _aclocaldir %(aclocal --print-ac-dir)}%_aclocaldir
+%_aclocaldir	%{expand:%%global _aclocaldir %(aclocal --print-ac-dir || echo ERROR)}%_aclocaldir
 
 # Location of omf files
-%_omf_dest_dir	%{expand:%%global _omf_dest_dir %(scrollkeeper-config --omfdir)}%_omf_dest_dir
+%_omf_dest_dir	%{expand:%%global _omf_dest_dir %(scrollkeeper-config --omfdir || echo ERROR)}%_omf_dest_dir
 
 # Location of pkgconfig files
 %_pkgconfigdir	/usr/%{_lib}/pkgconfig
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.441&r2=1.442&f=u