From 64c97a4b36003debb68b50d5301c3cbcaab288a8 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Thu, 3 Oct 2002 13:45:35 +0000
Subject: [PATCH] fixed syntax

---
 scripts/fixup-binconfig | 10 +++++-----
 scripts/fixup-pkgconfig |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/fixup-binconfig b/scripts/fixup-binconfig
index b08bc1e..0683b95 100755
--- a/scripts/fixup-binconfig
+++ b/scripts/fixup-binconfig
@@ -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
 }
diff --git a/scripts/fixup-pkgconfig b/scripts/fixup-pkgconfig
index 989f4e0..015ebd9 100755
--- a/scripts/fixup-pkgconfig
+++ b/scripts/fixup-pkgconfig
@@ -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
 }