summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2000-03-31 01:41:27 +0000
committerBruce Momjian2000-03-31 01:41:27 +0000
commitc2c992be70b631888d90be7c67ff52e648560609 (patch)
treeba35a93f06994f95eb6d76969755b4d8b26c710b
parent01a9df340f7bf594113b0f14338433a7c163bfe6 (diff)
Update make_mkid for mkid version 4.0.
-rwxr-xr-xsrc/test/regress/regress.sh6
-rwxr-xr-xsrc/tools/make_mkid2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index 3272f70986..8380a09928 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -10,7 +10,7 @@ hostname=$1
shift
extratests="$*"
-if [ "x$hostname" = "xwin" -o "x$hostname" = "xi386-pc-qnx4" ]; then
+if [ "x$hostname" = "xwin" -o "x$hostname" = "xi386-qnx-qnx4" ]; then
HOSTLOC="-h localhost"
else
HOSTLOC=""
@@ -79,7 +79,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
-if [ "x$hostname" != "xi386-pc-qnx4" ]; then
+if [ "x$hostname" != "xi386-qnx-qnx4" ]; then
echo "=============== installing languages... ================="
$ECHO_N "installing PL/pgSQL .. " $ECHO_C
createlang $HOSTLOC plpgsql regression
@@ -94,7 +94,7 @@ fi
echo "=============== running regression queries... ================="
echo "" > regression.diffs
-if [ "x$hostname" = "xi386-pc-qnx4" ]; then
+if [ "x$hostname" = "xi386-qnx-qnx4" ]; then
DIFFOPT="-b"
else
DIFFOPT="-w"
diff --git a/src/tools/make_mkid b/src/tools/make_mkid
index 0a8f5a34d2..42e2498928 100755
--- a/src/tools/make_mkid
+++ b/src/tools/make_mkid
@@ -1,6 +1,6 @@
#!/bin/sh
find `pwd`/ \( -name _deadcode -a -prune \) -o \
- -type f -name '*.[chyl]' -print|sed 's;//;/;g' | mkid -S.gen=C -
+ -type f -name '*.[chyl]' -print|sed 's;//;/;g' | mkid
find . -name 'CVS' -prune -o -type d -print |while read DIR
do