From 49773c48a3f0b4a16d85798ce07653fb251be708 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 20 Aug 2017 15:57:55 +0200
Subject: Don't distribute generated version.hxx and don't clean version

Now the clean operation in src_root should result in state identical to
distributed (which appears to be important to some packaging systems, e.g.,
Debian).
---
 build2/buildfile   |  1 -
 build2/version.hxx | 18 ------------------
 buildfile          |  9 +++++++--
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 build2/version.hxx

diff --git a/build2/buildfile b/build2/buildfile
index 8c33828..55ce59d 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -11,7 +11,6 @@ libu{b}: {hxx ixx txx cxx}{** -b -b-options -version} \
          $libs
 
 hxx{version}: in{version} $src_root/file{manifest}
-hxx{version}: dist = true
 
 # Pass our compiler target to be used as build2 host.
 #
diff --git a/build2/version.hxx b/build2/version.hxx
deleted file mode 100644
index 17383fc..0000000
--- a/build2/version.hxx
+++ /dev/null
@@ -1,18 +0,0 @@
-// file      : build2/version.hxx -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_VERSION // Note: using the version macro itself.
-
-// This is a "fake" version used to bootstrap from the repository (we include
-// a pre-generated version in distributions).
-//
-#define BUILD2_VERSION      9999999990000ULL
-
-#define BUILD2_VERSION_STR  "999.999.999"
-#define BUILD2_VERSION_ID   "999.999.999"
-
-#define LIBBUTL_VERSION_STR "999.999.999"
-#define LIBBUTL_VERSION_ID  "999.999.999"
-
-#endif // BUILD2_VERSION
diff --git a/buildfile b/buildfile
index 90a4c09..3ef5829 100644
--- a/buildfile
+++ b/buildfile
@@ -6,8 +6,13 @@
     doc{INSTALL LICENSE NEWS README version}                      \
     file{INSTALL.cli bootstrap* config.guess config.sub manifest}
 
-doc{version}: file{manifest} # Generated by the version module.
-doc{version}: dist = true
+# The version file is auto-generated (by the version module) from manifest.
+# Include it in distribution and 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)
 
 # Don't install tests or the INSTALL file.
 #
-- 
cgit v1.1