Get rid of doc{version} and types for testscript and manifest in buildfiles

4 files changed, 3 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 3dd23c1..19c7b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,3 @@
 *.exe.dlls/
 *.exe.manifest
 *.pc
-
-# Generated version.
-#
-version
diff --git a/buildfile b/buildfile
index edf5e7f..5374b96 100644
--- a/buildfile
+++ b/buildfile
@@ -2,15 +2,7 @@
 # copyright : Copyright (c) 2016-2017 Code Synthesis Ltd
 # license   : PostgreSQL License; see accompanying COPYRIGHT file
 
-./: {*/ -build/} doc{COPYRIGHT INSTALL README version} file{manifest}
-
-# The version file is auto-generated (by the version module) from manifest.
-# Include it in distribution and don't remove when cleaning in src (so that
-# clean results in a state identical to distributed).
-#
-doc{version}: file{manifest}
-doc{version}: dist  = true
-doc{version}: clean = ($src_root != $out_root)
+./: {*/ -build/} doc{COPYRIGHT INSTALL README} manifest
 
 # Don't install tests or the INSTALL file.
 #
diff --git a/libpq/buildfile b/libpq/buildfile
index 87000d9..6555bad 100644
--- a/libpq/buildfile
+++ b/libpq/buildfile
@@ -37,7 +37,7 @@ else
 # The version file is an internal one (it is only included from
 # postgresql/pg_config.h) so we don't distribute nor install it (see below).
 #
-h{version}: in{version} $src_root/file{manifest}
+h{version}: in{version} $src_root/manifest
 
 c.poptions += -DFRONTEND -DUNSAFE_STAT_OK -DSO_MAJOR_VERSION=$abi_major
 
diff --git a/tests/conninfo/buildfile b/tests/conninfo/buildfile
index 3ba850b..0c0682b 100644
--- a/tests/conninfo/buildfile
+++ b/tests/conninfo/buildfile
@@ -7,7 +7,7 @@
 #
 import libs = libpq%lib{pq}
 
-exe{driver}: {h c}{* -uri-regress} $libs test{testscript} \
+exe{driver}: {h c}{* -uri-regress} $libs testscript      \
              file{uri-regress.c regress.in expected.out}
 
 c.poptions =+ "-I$src_base"