# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1650374798 14400
# Node ID 4ba9eb3f70c938feeac482f9f81a295ce96dae28
# Parent  fe02890201ace279dad9cd82c9d1bb1875e88716
* installer-files/cmdshell.bat, installer-files/octave-firsttime.vbs,
  installer-files/octave-launch.c, installer-files/octave.bat,
  installer-files/octave.vbs: add pkg config path env

diff -r fe02890201ac -r 4ba9eb3f70c9 installer-files/cmdshell.bat
--- a/installer-files/cmdshell.bat	Sun Apr 17 10:44:20 2022 +0200
+++ b/installer-files/cmdshell.bat	Tue Apr 19 09:26:38 2022 -0400
@@ -25,6 +25,9 @@
 if EXIST "%OCTAVE_HOME%mingw32\bin\octave-cli.exe" set OCTAVE_HOME=%OCTAVE_HOME%mingw32\
 if EXIST "%OCTAVE_HOME%mingw64\bin\octave-cli.exe" set OCTAVE_HOME=%OCTAVE_HOME%mingw64\
 
+Rem pkgconfig .pc path
+set PKG_CONFIG_PATH=%OCTAVE_HOME%\lib\pkgconfig
+
 Rem   Set up PATH. Make sure the octave bin dir
 Rem   comes first.
 set PATH=%OCTAVE_HOME%qt5\bin;%OCTAVE_HOME%bin;%OCTAVE_HOME%python;%PATH%
diff -r fe02890201ac -r 4ba9eb3f70c9 installer-files/octave-firsttime.vbs
--- a/installer-files/octave-firsttime.vbs	Sun Apr 17 10:44:20 2022 +0200
+++ b/installer-files/octave-firsttime.vbs	Tue Apr 19 09:26:38 2022 -0400
@@ -55,6 +55,9 @@
   wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\plugins"
 End If
 
+' pkg config pc path
+wshSystemEnv("PKG_CONFIG_PATH") = OctavePath & "\lib\pkgconfig"
+
 ' set directory to users
 startpath = wshShell.ExpandEnvironmentStrings("%UserProfile%")
 wshShell.CurrentDirectory = startpath
diff -r fe02890201ac -r 4ba9eb3f70c9 installer-files/octave-launch.c
--- a/installer-files/octave-launch.c	Sun Apr 17 10:44:20 2022 +0200
+++ b/installer-files/octave-launch.c	Tue Apr 19 09:26:38 2022 -0400
@@ -217,6 +217,13 @@
     SetEnvironmentVariableW (L"PATH", newpathbuffer);
   }
 
+  /* pkg config pc path */
+  nSize = lstrlenW (path);
+  StringCchCatW (path, PATH_SZ, L"\\lib\\pkgconfig");
+  SetEnvironmentVariableW (L"PKG_CONFIG_PATH", path);
+
+  path[nSize] = L'\0';
+
   /* other env */
   SetEnvironmentVariableW (L"TERM", L"cygwin");
   SetEnvironmentVariableW (L"GNUTERM", L"wxt");
diff -r fe02890201ac -r 4ba9eb3f70c9 installer-files/octave.bat
--- a/installer-files/octave.bat	Sun Apr 17 10:44:20 2022 +0200
+++ b/installer-files/octave.bat	Tue Apr 19 09:26:38 2022 -0400
@@ -41,6 +41,9 @@
   set QT_PLUGIN_PATH=%OCT_HOME%\plugins
 )
 
+Rem pkgconfig .pc path
+set PKG_CONFIG_PATH=%OCT_HOME%\lib\pkgconfig
+
 Rem set home if not already set
 if "%HOME%"=="" set HOME=%USERPROFILE%
 if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH%
diff -r fe02890201ac -r 4ba9eb3f70c9 installer-files/octave.vbs
--- a/installer-files/octave.vbs	Sun Apr 17 10:44:20 2022 +0200
+++ b/installer-files/octave.vbs	Tue Apr 19 09:26:38 2022 -0400
@@ -56,6 +56,9 @@
   wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\plugins"
 End If
 
+' pkg config pc path
+wshSystemEnv("PKG_CONFIG_PATH") = OctavePath & "\lib\pkgconfig"
+
 ' check args to see if told to run gui or command line
 ' and build other args to use
 GUI_MODE=1