Allow overridable pkg-config in generated Makefiles

Origin: Debian
Bug: https://github.com/WeAreROLI/JUCE/issues/677
Last-Update: 2020-03-16

E.g. to allow cross-building of juce-packages.
See also https://bugs.debian.org/951684
Last-Update: 2020-03-16

Gbp-Pq: Name overridable_pkg-config.patch

diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
index 27527881e272903dc61e9d5c3c2ed4959a56b00e..2a5aa9fb815513dc550969a01eeaf61e9d66a028 100644 (file)
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
@@ -246,8 +246,8 @@ public:
 \r
             if (! packages.isEmpty())\r
             {\r
-                out << "\t@command -v pkg-config >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine\r
-                    << "\t@pkg-config --print-errors";\r
+                out << "\t@command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine\r
+                    << "\t@$(PKG_CONFIG) --print-errors";\r
 \r
                 for (auto& pkg : packages)\r
                     out << " " << pkg;\r
@@ -507,7 +507,7 @@ private:
         auto packages = getPackages();\r
 \r
         if (packages.size() > 0)\r
-            return "$(shell pkg-config --cflags " + packages.joinIntoString (" ") + ")";\r
+            return "$(shell $(PKG_CONFIG) --cflags " + packages.joinIntoString (" ") + ")";\r
 \r
         return {};\r
     }\r
@@ -517,7 +517,7 @@ private:
         auto packages = getPackages();\r
 \r
         if (packages.size() > 0)\r
-            return "$(shell pkg-config --libs " + packages.joinIntoString (" ") + ")";\r
+            return "$(shell $(PKG_CONFIG) --libs " + packages.joinIntoString (" ") + ")";\r
 \r
         return {};\r
     }\r
@@ -912,6 +912,11 @@ private:
             << "endif"         << newLine\r
             << newLine;\r
 \r
+        out << "ifndef PKG_CONFIG"  << newLine\r
+            << "  PKG_CONFIG=pkg-config" << newLine\r
+            << "endif"         << newLine\r
+            << newLine;\r
+\r
         out << "ifndef AR" << newLine\r
             << "  AR=ar"   << newLine\r
             << "endif"     << newLine\r