From 99441908700b1862fb3895bd7178f434b2fd9aa0 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 24 Aug 2017 12:53:07 +0300
Subject: Add version.hxx back into distribution and don't clean it up from src

---
 README-GIT          | 4 ++++
 libbpkg/.gitignore  | 1 -
 libbpkg/buildfile   | 6 ++++++
 libbpkg/version.hxx | 0
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 README-GIT
 delete mode 100644 libbpkg/.gitignore
 create mode 100644 libbpkg/version.hxx

diff --git a/README-GIT b/README-GIT
new file mode 100644
index 0000000..7975aa4
--- /dev/null
+++ b/README-GIT
@@ -0,0 +1,4 @@
+The checked out libbpkg/version.hxx will be overwritten during the build
+process but these changes should be ignored. To do this automatically, run:
+
+git update-index --assume-unchanged libbpkg/version.hxx
diff --git a/libbpkg/.gitignore b/libbpkg/.gitignore
deleted file mode 100644
index 426db9e..0000000
--- a/libbpkg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-version.hxx
diff --git a/libbpkg/buildfile b/libbpkg/buildfile
index c55fd20..7560620 100644
--- a/libbpkg/buildfile
+++ b/libbpkg/buildfile
@@ -6,7 +6,13 @@ import int_libs = libbutl%lib{butl}
 
 lib{bpkg}: {hxx ixx txx cxx}{** -version} {hxx}{version} $int_libs
 
+# Include the generated version header into the distribution (so that we don't
+# pick up an installed one) and don't remove it when cleaning in src (so that
+# clean results in a state identical to distributed).
+#
 hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: dist  = true
+hxx{version}: clean = ($src_root != $out_root)
 
 # For pre-releases use the complete version to make sure they cannot be used
 # in place of another pre-release or the final version.
diff --git a/libbpkg/version.hxx b/libbpkg/version.hxx
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.1