summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rwxr-xr-xbin/gbuild-to-ide4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 29d76e190973..503f74acefb8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,7 +330,7 @@ dump-deps-png:
define gb_Top_GbuildToIdeIntegration
$(1)-ide-integration:
- cd $(SRCDIR) && ($(GNUMAKE) cmd="$(GNUMAKE) -npf Makefile.gbuild all" cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
+ cd $(SRCDIR) && (LC_MESSAGES=C $(GNUMAKE) cmd="$(GNUMAKE) -npf Makefile.gbuild all" cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
endef
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 4fa6bd78f1a4..0f08d7123fe9 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -70,8 +70,8 @@ class GbuildParser:
builddirpattern = re.compile('^BUILDDIR = (.*)')
instdirpattern = re.compile('^INSTDIR = (.*)')
binpathpattern = re.compile('LS = (.*)ls(.exe)?')
- libpattern = re.compile('# [a-z]+ to execute \(from `(.*)/Library_(.*)\.mk\', line [0-9]*\):')
- exepattern = re.compile('# [a-z]+ to execute \(from `(.*)/Executable_(.*)\.mk\', line [0-9]*\):')
+ libpattern = re.compile('# [a-z]+ to execute \(from [\'`](.*)/Library_(.*)\.mk\', line [0-9]*\):')
+ exepattern = re.compile('# [a-z]+ to execute \(from [\'`](.*)/Executable_(.*)\.mk\', line [0-9]*\):')
includepattern = re.compile('# INCLUDE := (.*)')
defspattern = re.compile('# DEFS := (.*)')
cxxpattern = re.compile('# CXXOBJECTS := (.*)')