From 4a537f0925633186435bb4efb62757e9b01b5868 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 20 Jun 2022 16:07:11 -0700 Subject: [PATCH 1/3] Flexibly install ignition or gz Signed-off-by: methylDragon --- ubuntu/debian/libignition-utils-cli-dev.install | 8 ++++---- ubuntu/debian/libignition-utils-dev.install | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/debian/libignition-utils-cli-dev.install b/ubuntu/debian/libignition-utils-cli-dev.install index 1c275a5..dabb2ca 100644 --- a/ubuntu/debian/libignition-utils-cli-dev.install +++ b/ubuntu/debian/libignition-utils-cli-dev.install @@ -1,4 +1,4 @@ -usr/include/ignition/*/ignition/utils/cli/* -usr/include/ignition/*/ignition/utils/cli.hh -usr/lib/*/pkgconfig/ignition-utils?-cli.pc -usr/lib/*/cmake/ignition-utils?-cli/* +usr/include/+(ignition|gz)/*/+(ignition|gz)/utils/cli/* +usr/include/+(ignition|gz)/*/+(ignition|gz)/utils/cli.hh +usr/lib/*/pkgconfig/+(ignition|gz)-utils?-cli.pc +usr/lib/*/cmake/+(ignition|gz)-utils?-cli/* diff --git a/ubuntu/debian/libignition-utils-dev.install b/ubuntu/debian/libignition-utils-dev.install index 214f993..d2eb06e 100644 --- a/ubuntu/debian/libignition-utils-dev.install +++ b/ubuntu/debian/libignition-utils-dev.install @@ -1,5 +1,5 @@ usr/include/* usr/lib/*/*.so usr/lib/*/pkgconfig/*.pc -usr/lib/*/cmake/ignition-utils*/* -usr/share/ignition/*/* \ No newline at end of file +usr/lib/*/cmake/+(ignition|gz)-utils*/* +usr/share/+(ignition|gz)/*/* \ No newline at end of file From 13cd60b7986cd5a803ae7578ab6e9060a0c46a29 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 20 Jun 2022 20:35:41 -0700 Subject: [PATCH 2/3] Use wildcard to enable flexible installs Signed-off-by: methylDragon --- ubuntu/debian/libignition-utils-cli-dev.install | 8 ++++---- ubuntu/debian/libignition-utils-dev.install | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/debian/libignition-utils-cli-dev.install b/ubuntu/debian/libignition-utils-cli-dev.install index dabb2ca..e9c3ed9 100644 --- a/ubuntu/debian/libignition-utils-cli-dev.install +++ b/ubuntu/debian/libignition-utils-cli-dev.install @@ -1,4 +1,4 @@ -usr/include/+(ignition|gz)/*/+(ignition|gz)/utils/cli/* -usr/include/+(ignition|gz)/*/+(ignition|gz)/utils/cli.hh -usr/lib/*/pkgconfig/+(ignition|gz)-utils?-cli.pc -usr/lib/*/cmake/+(ignition|gz)-utils?-cli/* +usr/include/*/*/*/utils/cli/* +usr/include/*/*/*/utils/cli.hh +usr/lib/*/pkgconfig/*-utils?-cli.pc +usr/lib/*/cmake/*-utils?-cli/* diff --git a/ubuntu/debian/libignition-utils-dev.install b/ubuntu/debian/libignition-utils-dev.install index d2eb06e..2953550 100644 --- a/ubuntu/debian/libignition-utils-dev.install +++ b/ubuntu/debian/libignition-utils-dev.install @@ -1,5 +1,5 @@ usr/include/* usr/lib/*/*.so usr/lib/*/pkgconfig/*.pc -usr/lib/*/cmake/+(ignition|gz)-utils*/* -usr/share/+(ignition|gz)/*/* \ No newline at end of file +usr/lib/*/cmake/*-utils*/* +usr/share/*/*/* \ No newline at end of file From 902e783582ec71d44f15316b9da89e61ccc10eb3 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 22 Jun 2022 13:38:47 -0700 Subject: [PATCH 3/3] Narrow install rule for share dirs and remove redundant gz rules Signed-off-by: methylDragon --- ubuntu/debian/libignition-utils-dev.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/libignition-utils-dev.install b/ubuntu/debian/libignition-utils-dev.install index 2953550..eb9044f 100644 --- a/ubuntu/debian/libignition-utils-dev.install +++ b/ubuntu/debian/libignition-utils-dev.install @@ -2,4 +2,4 @@ usr/include/* usr/lib/*/*.so usr/lib/*/pkgconfig/*.pc usr/lib/*/cmake/*-utils*/* -usr/share/*/*/* \ No newline at end of file +usr/share/ignition/*/* \ No newline at end of file