sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed syntax

Browse Source
This commit is contained in:
Дмитрий Левин 2002-10-03 13:45:35 +00:00
parent 5fe2d43d01
commit 64c97a4b36
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/fixup-binconfig
View File

@ -95,7 +95,7 @@ fix()
>"$f_saved"
while ! cmp -s "$f_new" "$f_saved"; do
cat "$f_new" >"$f_saved"
subst 's,\(^\|-I\|[="'\'']\| \+\)\${includedir}\($\|["'\'']\| \+\),\1\3,g' -- "$f_new"
subst 's,\(^\|[="'\'']\| \+\)-I\${includedir}\($\|["'\'']\| \+\),\1\3,g' -- "$f_new"
done
fi
@ -103,7 +103,7 @@ fix()
>"$f_saved"
while ! cmp -s "$f_new" "$f_saved"; do
cat "$f_new" >"$f_saved"
subst 's,\(^\|-I\|[="'\'']\| \+\)\${exec_prefix}/include\($\|["'\'']\| \+\),\1\3,g' -- "$f_new"
subst 's,\(^\|[="'\'']\| \+\)-I\${exec_prefix}/include\($\|["'\'']\| \+\),\1\3,g' -- "$f_new"
done
fi
@ -111,12 +111,12 @@ fix()
>"$f_saved"
while ! cmp -s "$f_new" "$f_saved"; do
cat "$f_new" >"$f_saved"
subst 's,\(^\|-I\|[="'\'']\| \+\)\${prefix}/include\($\|["'\'']\| \+\),\1\3,g' -- "$f_new"
subst 's,\(^\|[="'\'']\| \+\)-I\${prefix}/include\($\|["'\'']\| \+\),\1\3,g' -- "$f_new"
done
fi
if ! cmp -s "$f_new" "$f"; then
diff -u "$f" "$f_new" >&2 ||:
diff "$f" "$f_new" >&2 ||:
cat "$f_new" >"$f"
fi
@ -155,7 +155,7 @@ fix()
fi
if ! cmp -s "$f_new" "$f"; then
diff -u "$f" "$f_new" >&2 ||:
diff "$f" "$f_new" >&2 ||:
cat "$f_new" >"$f"
fi
}

6
scripts/fixup-pkgconfig
View File

@ -45,7 +45,7 @@ fix()
local includedir=
local libdir=
sed -ne "s/^\([a-z_]\+\)=\([^']*\)\$/local \1=\2/pg" "$f" >"$TMPFILE"
sed -ne "s/^\(\([a-z_]*\)\(prefix\|dir\|path\)\)=\(.*\)\$/local \1=\4/pg" "$f" >"$TMPFILE"
# source parameters
@ -100,7 +100,7 @@ fix()
new_val="${new_val%% }"
if [ "$new_val" != "$old_val" ]; then
subst -p "s,^Cflags: .*,Cflags: $new_val,g" "$f"
subst -p "s|^Cflags: .*|Cflags: $new_val|g" -- "$f"
echo "${fname#.}: Cflags: '$old_val' --> '$new_val'" >&2
fi
@ -137,7 +137,7 @@ fix()
new_val="${new_val%% }"
if [ "$new_val" != "$old_val" ]; then
subst -p "s,^Libs: .*,Libs: $new_val,g" "$f"
subst -p "s|^Libs: .*|Libs: $new_val|g" -- "$f"
echo "${fname#.}: Libs: '$old_val' --> '$new_val'" >&2
fi
}