# HG changeset patch
# User jbe
# Date 1404945128 -7200
# Node ID 92d9218140f772c277a3f8067f6e6f930c238215
# Parent  82c1daccd7cf15ddd53651b56b29289aa2e03797
Cleanup of Makefile.options; Removed wrong escape character in framework/bin/langtool.lua

diff -r 82c1daccd7cf -r 92d9218140f7 Makefile.options
--- a/Makefile.options	Thu Jul 10 00:27:22 2014 +0200
+++ b/Makefile.options	Thu Jul 10 00:32:08 2014 +0200
@@ -17,10 +17,10 @@
 CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include -I /usr/local/include/lua52
 
 # additional C compiler flags for parts which depend on PostgreSQL
-CFLAGS_PGSQL = -I /usr/local/include/postgresql/server -I /usr/local/include/postgresql
+CFLAGS_PGSQL = -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
 
 # linker flags
-LDFLAGS = -shared -L /usr/lib -L /usr/local/lib -L /usr/local/include/lua52
+LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
 
 # additional linker flags for parts which depend on PostgreSQL
 LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
diff -r 82c1daccd7cf -r 92d9218140f7 framework/bin/langtool.lua
--- a/framework/bin/langtool.lua	Thu Jul 10 00:27:22 2014 +0200
+++ b/framework/bin/langtool.lua	Thu Jul 10 00:32:08 2014 +0200
@@ -88,7 +88,7 @@
       if string.find(filename, "%.lua$") then
         for line in io.lines(path .. "/" .. filename) do
           -- TODO: exact parsing of comments and escape characters
-          for key in string.gmatch(line, "_%(?'([^'\]+)'") do
+          for key in string.gmatch(line, "_%(?'([^']+)'") do
             if
               key ~= "([^" and
               (not string.find(key, "^%s*%.%.[^%.]")) and
@@ -98,7 +98,7 @@
               translations[key] = false
             end
           end
-          for key in string.gmatch(line, '_%(?"([^"\]+)"') do
+          for key in string.gmatch(line, '_%(?"([^"]+)"') do
             if
               key ~= "([^" and
               (not string.find(key, "^%s*%.%.[^%.]")) and