From 3cb8348cacc6bb60b99a82893b0ba739ccd1c78b Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 3 Feb 2019 12:36:23 +0000 Subject: Tidy up install targets --- icetray/Jamfile.jam | 7 +++++++ icetray/dryice/Jamfile.jam | 2 +- icetray/icetray/Jamfile.jam | 5 +++++ icetray/tool/Jamfile.jam | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/icetray/Jamfile.jam b/icetray/Jamfile.jam index f6df0c9..f44d506 100644 --- a/icetray/Jamfile.jam +++ b/icetray/Jamfile.jam @@ -15,3 +15,10 @@ build-project icetray ; build-project dryice ; build-project tool ; +explicit install ; +alias install : + dryice//dryice + icetray//install + tool//install + ; + diff --git a/icetray/dryice/Jamfile.jam b/icetray/dryice/Jamfile.jam index d17c9c9..0735af3 100644 --- a/icetray/dryice/Jamfile.jam +++ b/icetray/dryice/Jamfile.jam @@ -15,5 +15,5 @@ lib dryice : . ; -package.install install-dryice : . : : dryice : [ glob *.h ] ; +package.install install : . : : dryice : [ glob *.h ] ; diff --git a/icetray/icetray/Jamfile.jam b/icetray/icetray/Jamfile.jam index cba31bb..d27f3ea 100644 --- a/icetray/icetray/Jamfile.jam +++ b/icetray/icetray/Jamfile.jam @@ -25,6 +25,11 @@ lib icetray : ..//boost_thread ; +explicit install ; +alias install : + install-main + install-ice + ; package.install install-main : : : icetray : [ glob-tree *.h : defaultPool.h ] ; package.install-data install-ice : icetray/ice : [ glob *.ice ] ; diff --git a/icetray/tool/Jamfile.jam b/icetray/tool/Jamfile.jam index 9d53f4e..6df95af 100644 --- a/icetray/tool/Jamfile.jam +++ b/icetray/tool/Jamfile.jam @@ -21,8 +21,8 @@ exe icetray-doc : dl ; -explicit install-tools ; -alias install-tools : +explicit install ; +alias install : install-tools-data install-tools-bin ; -- cgit v1.2.3