commit ec0082cc83ea0be6f304f72c5241c0032253242b
Author: Elan Ruusamäe <[email protected]>
Date: Mon May 29 21:45:21 2006 +0000
- move %buildroot->$RPM_BUILD_ROOT earlier, req by zbyniu
Changed files:
adapter.awk -> 1.310
adapter.awk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 21dfa4b..86892a7 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -440,6 +440,10 @@ function b_makekey(a, b, s) {
preamble = 0
+ # foreign rpms
+ $0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
+ $0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
+
if (/^[ \t]*rm([ \t]+-[rf]+)*[ \t]+\${?RPM_BUILD_ROOT}?/ &&
did_rmroot==0) {
did_rmroot=1
print "rm -rf $RPM_BUILD_ROOT"
@@ -481,10 +485,6 @@ function b_makekey(a, b, s) {
if ($1 ~ /chmod/ && $2 ~ /644/)
next
- # foreign rpms
- $0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
- $0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
-
# atrpms
$0 = fixedsub("%perl_makeinstall", "%{__make} pure_install
\\\n\tDESTDIR=$RPM_BUILD_ROOT", $0);
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
