From cc6afc33ab4a03cc9484d3b68db6654b71075670 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 20 Jun 2022 16:07:08 -0700 Subject: [PATCH 1/2] Flexibly install ignition or gz Signed-off-by: methylDragon --- ubuntu/debian/libignition-launch-dev.install | 4 ++-- ubuntu/debian/libignition-launch.install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ubuntu/debian/libignition-launch-dev.install b/ubuntu/debian/libignition-launch-dev.install index 793e3af..f23688a 100644 --- a/ubuntu/debian/libignition-launch-dev.install +++ b/ubuntu/debian/libignition-launch-dev.install @@ -1,7 +1,7 @@ usr/include/* usr/lib/*/*.so usr/lib/*/pkgconfig/*.pc -usr/lib/*/cmake/ignition-launch*/* -usr/lib/*/ignition/launch*/* +usr/lib/*/cmake/+(ignition|gz)-launch*/* +usr/lib/*/+(ignition|gz)/launch*/* usr/share/* usr/lib/ruby/* diff --git a/ubuntu/debian/libignition-launch.install b/ubuntu/debian/libignition-launch.install index 8896f7f..57357f5 100644 --- a/ubuntu/debian/libignition-launch.install +++ b/ubuntu/debian/libignition-launch.install @@ -1,2 +1,2 @@ usr/lib/*/*.so.* -usr/lib/*/ign-launch-*/plugins/*.so +usr/lib/*/+(ign|gz)-launch-*/plugins/*.so From 861a42c3ac48441cc1d241d5b22b13a328de6065 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 20 Jun 2022 20:35:41 -0700 Subject: [PATCH 2/2] Use wildcard to enable flexible installs Signed-off-by: methylDragon --- ubuntu/debian/libignition-launch-dev.install | 4 ++-- ubuntu/debian/libignition-launch.install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ubuntu/debian/libignition-launch-dev.install b/ubuntu/debian/libignition-launch-dev.install index f23688a..a179ea4 100644 --- a/ubuntu/debian/libignition-launch-dev.install +++ b/ubuntu/debian/libignition-launch-dev.install @@ -1,7 +1,7 @@ usr/include/* usr/lib/*/*.so usr/lib/*/pkgconfig/*.pc -usr/lib/*/cmake/+(ignition|gz)-launch*/* -usr/lib/*/+(ignition|gz)/launch*/* +usr/lib/*/cmake/*-launch*/* +usr/lib/*/*/launch*/* usr/share/* usr/lib/ruby/* diff --git a/ubuntu/debian/libignition-launch.install b/ubuntu/debian/libignition-launch.install index 57357f5..eb36b20 100644 --- a/ubuntu/debian/libignition-launch.install +++ b/ubuntu/debian/libignition-launch.install @@ -1,2 +1,2 @@ usr/lib/*/*.so.* -usr/lib/*/+(ign|gz)-launch-*/plugins/*.so +usr/lib/*/*-launch-*/plugins/*.so