Move juceaide to juce-modules-source as well (and into a private location)

diff --git a/debian/juce-modules-source.install b/debian/juce-modules-source.install
index a4c6c2f35e7cabdaef9b61a1ecd0d938f59f5495..2faf855dc80aa5f9405b4c997481aca2ba549460 100644 (file)
--- a/debian/juce-modules-source.install
+++ b/debian/juce-modules-source.install
@@ -1,2 +1,3 @@
 usr/lib/cmake/*        /usr/lib/${DEB_HOST_MULTIARCH}/cmake/
 usr/bin/JUCE*/juce*    /usr/lib/${DEB_HOST_MULTIARCH}/juce/
+usr/bin/juce*          /usr/lib/${DEB_HOST_MULTIARCH}/juce/

diff --git a/debian/juce-tools.install b/debian/juce-tools.install
index ff5892fc4e9bed2677e9c7e8bbf97c79bd052803..9bf05a17966be0f640eb2e48e8859b15cc6e5545 100644 (file)
--- a/debian/juce-tools.install
+++ b/debian/juce-tools.install
@@ -1,4 +1,3 @@
 debian/Projucer.desktop                                usr/share/applications/
 debian/artifacts/juce.png                              usr/share/pixmaps/
 */extras/Projucer/Projucer_artefacts/*/Projucer                usr/bin/
-usr/bin/juce*                                          usr/bin/

diff --git a/debian/rules b/debian/rules
index a5a656c188b9fa4826201ab68b78fdbcd3a3d4d6..73e6d280ded72afac4802308c6d01468c760ca1b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,6 +71,9 @@ execute_after_dh_install-arch:
        -find $(CURDIR)/debian/juce-modules-source/ \
                -type f -name "LV2_HELPER*.cmake" -exec \
                sed -e 's|"[^"]*/juce_lv2_helper"|"/usr/lib/@DEB_HOST_MULTIARCH@/juce/juce_lv2_helper"|' -e "s|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|" -i {} +
+       -find $(CURDIR)/debian/juce-modules-source/ \
+               -type f -name "JUCEConfig.cmake" -exec \
+               sed -e 's|"[^"]*/bin/juceaide"|"/usr/lib/@DEB_HOST_MULTIARCH@/juce/juceaide"|' -e "s|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|" -i {} +
 
 override_dh_install-indep:
        dh_install --indep -X.tag