Update make_mkid for mkid version 4.0.

diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index b4804bb7dba56b8b9afcfdc4a689a61864b5c48f..a491250d675aca5866e94826184ee32034987fe6 100755 (executable)
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.45 2000/03/16 14:37:33 thomas Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.46 2000/03/31 01:41:26 momjian Exp $
 #
 if [ $# -eq 0 ]; then
        echo "Syntax: $0 <hostname> [extra-tests]"
@@ -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 0a8f5a34d20d247202e2b34a22c204b788f65893..42e249892838a630c9c5734778d3be9e811e50f6 100755 (executable)
--- 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