Fix gcc library paths for mkportable
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 31 Jan 2017 09:42:32 +0000 (10:42 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 31 Jan 2017 09:42:32 +0000 (10:42 +0100)
* mkportable-full.h,
mkportable-light.h,
mkportable-vanilla.h: Search libgcc and libstdcc in the top dir
where they are installed.

src/mkportable-full.h
src/mkportable-light.h
src/mkportable-vanilla.h

index f2df2fe..661d020 100644 (file)
@@ -148,8 +148,7 @@ const char * const full_files[] =
   "pub/gpgconf.exe",
   "pub/gpgsm.exe",
   "pub/gpgv.exe",
-  "pub/libgcc_s_sjlj-1.dll",
-  "pub/libstdc++-6.dll",
+  "libstdc++-6.dll",
   "qdbus.exe",
   "qt.conf",
   "QtCore4.dll",
index 91ee2f1..54947da 100644 (file)
@@ -102,8 +102,8 @@ const char * const light_files[] =
   "pub/gpgconf.exe",
   "pub/gpgsm.exe",
   "pub/gpgv.exe",
-  "pub/libgcc_s_sjlj-1.dll",
-  "pub/libstdc++-6.dll",
+  "libgcc_s_sjlj-1.dll",
+  "libstdc++-6.dll",
   "scdaemon.exe",
   "scute.dll",
   "sha1sum.exe",
index cbed38e..d47818c 100644 (file)
@@ -45,8 +45,8 @@ const char * const vanilla_files[] =
   "pub/gpgconf.exe",
   "pub/gpgsm.exe",
   "pub/gpgv.exe",
-  "pub/libgcc_s_sjlj-1.dll",
-  "pub/libstdc++-6.dll",
+  "libgcc_s_sjlj-1.dll",
+  "libstdc++-6.dll",
   "scdaemon.exe",
   "scute.dll",
   "sha1sum.exe",