aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <hohndel@mail.gr8dns.org>2013-05-18 09:44:54 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-18 09:49:37 -0700
commitde50f6625746928711d7fb7f0fa579d194931970 (patch)
tree81ea712a3c4c417d6ed120b55524fec8f1f42862 /Makefile
parent1fac07af4f5093df59d3ce3e85d660a817bd039e (diff)
downloadsubsurface-de50f6625746928711d7fb7f0fa579d194931970.tar.gz
Work around broken Marble on Debian
This is a major hack. Debian appears to be missing a necessary header file for Marble to work correctly. We include this header file for now and hack the Configure process to recognize that we are on Debian and force using our local copy of the header file in that case. This may be needed on Ubuntu as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d5b0ca84a..afcb274c7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ VERSION=3.1
CC=gcc
CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
CXX=g++
-CXXFLAGS=-Wall -g $(CLCXXFLAGS) -DQT_NO_KEYWORDS
+CXXFLAGS=-Wall -g $(CLCXXFLAGS) $(MARBLEFLAGS)
INSTALL=install
# these locations seem to work for SuSE and Fedora