From a3aa61bab2c88fce649a9515dec0ddb7d15be085 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 14 Dec 2013 12:49:23 -0500
Subject: bugfix: glib include fix


diff --git a/glib-2.0.pri b/glib-2.0.pri
index 0fbc4e2..2f293bf 100644
--- a/glib-2.0.pri
+++ b/glib-2.0.pri
@@ -7,14 +7,13 @@
 # 3. system's standard include paths from pkg-config
 
 glib-2.0 {
-
 # read environment variables
 OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
 GLIB2_DIR = $$(GLIB2DIR)
 
 !isEmpty(OPENSCAD_LIBRARIES_DIR) {
   isEmpty(GLIB2_INCLUDEPATH) {
-    GLIB2_INCLUDEPATH_1 = $$OPENSCAD_LIBRARIES_DIR/include/glib-2.0
+    GLIB2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/glib-2.0
     GLIB2_INCLUDEPATH_2 = $$OPENSCAD_LIBRARIES_DIR/lib/glib-2.0/include
     GLIB2_LIBPATH = $$OPENSCAD_LIBRARIES_DIR/lib
   }
@@ -23,7 +22,7 @@ GLIB2_DIR = $$(GLIB2DIR)
 isEmpty(GLIB2_INCLUDEPATH) {
   GLIB2_CFLAGS = $$system("pkg-config --cflags glib-2.0")
 } else {
-  GLIB2_CFLAGS = -I$$GLIB2_INCLUDEPATH_1
+  GLIB2_CFLAGS = -I$$GLIB2_INCLUDEPATH
   GLIB2_CFLAGS += -I$$GLIB2_INCLUDEPATH_2
 }
 
@@ -35,4 +34,6 @@ isEmpty(GLIB2_LIBPATH) {
 
 QMAKE_CXXFLAGS += $$GLIB2_CFLAGS
 LIBS += $$GLIB2_LIBS
+
+message("glib: $$GLIB2_CFLAGS")
 }
-- 
cgit v0.10.1