Allow pgindent to work with newer BSD indents.

diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index 99985227e5d8c201c817d7afbfd930d8f5d2d163..626273360a905cfb355bb261fcf3506362e3053e 100644 (file)
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -23,7 +23,7 @@ for the second bug in:
        /src/tools/pgindent/indent.bsd.patch
 
 Even with the workaround, installation of the patch produces better
-output.
+output.  You can get a patched BSD indent from ftp://ftp.postgresql.org/pub/dev.
 
 GNU indent, version 2.2.6, has several problems, and is not recommended.
 These bugs become pretty major when you are doing >400k lines of code.

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index f7c7b1e1251dacb2caace40555bab5cb136d46e7..9a467067ed1a2d4dcf9bf6658acbc217c56d5f6c 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -14,7 +14,7 @@ then  echo "Go to the src/tools/entab directory and do a 'make' and 'make install
        echo "Then run $0 again."
        exit 1
 fi
-indent -version </dev/null >/dev/null 2>&1
+indent -? </dev/null >/dev/null 2>&1
 if [ "$?" -ne 1 ]
 then   echo "You do not appear to have 'indent' installed on your system." >&2
        exit 1