From bdf887dd8900a3f0dbeaec24bbbcd402868a7428 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 31 Jul 2017 13:52:38 +0300
Subject: Redo header installation setup
---
odb/buildfile | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/odb/buildfile b/odb/buildfile
index 8d2d614..3d47652 100644
--- a/odb/buildfile
+++ b/odb/buildfile
@@ -30,10 +30,12 @@ lib{odb}: cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_BUILD2
liba{odb}: cxx.export.poptions += -DLIBODB_STATIC
libs{odb}: cxx.export.poptions += -DLIBODB_SHARED
-# Install into the odb/ subdirectory of, say, /usr/include/.
+# Install into the odb/ subdirectory of, say, /usr/include/ recreating
+# subdirectories.
#
-install.include = $install.include/odb/
-install.include.subdirs = true # Recreate subdirectories.
+install_include = include/odb/
+{hxx ixx txx}{*}: install = $install_include
+{hxx ixx txx}{*}: install.subdirs = true
if ($cxx.target.class != "windows")
details/win32/*: install = false
@@ -41,18 +43,18 @@ if ($cxx.target.class != "windows")
# We want these to be picked up even when LIBODB_BUILD2 is not defined.
#
hxx{version}@./: install = false
-hxx{version-build2}: install = $install.include/version.hxx
+hxx{version-build2}: install = $install_include/version.hxx
details/build2/:
{
if ($cxx.id == "msvc")
{
h{config}@./: install = false
- h{config-vc}@./: install = $install.include/details/
+ h{config-vc}@./: install = $install_include/details/
}
else
{
- h{config}@./: install = $install.include/details/
+ h{config}@./: install = $install_include/details/
h{config-vc}@./: install = false
}
}
--
cgit v1.1