diff --git a/external/glaserl/makefile b/external/glaserl/makefile
index 4120459..f49d9e7 100644
--- a/external/glaserl/makefile
+++ b/external/glaserl/makefile
@@ -1,7 +1,5 @@
 TARGET := libglaserl.a
 
-CFLAGS += -g -O2
-
 SOURCES := $(wildcard *.c)
 OBJECTS := $(SOURCES:.c=.o)
 
diff --git a/makefile b/makefile
index 0f9a9b6..292b759 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,6 @@
 APP := numptyphysics
 
 SOURCES := $(wildcard src/*.cpp)
-CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
 
 all: app
 
@@ -13,7 +12,7 @@ app: $(TARGET)
 
 $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
 	$(SILENTMSG) "\tLD\t$@\n"
-	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
+	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 clean: $(ADDITIONAL_CLEAN_TARGETS)
 	$(SILENTMSG) "\tCLEAN\n"
diff --git a/src/Os.cpp b/src/Os.cpp
index b5d7fb9..6a0ccf4 100644
--- a/src/Os.cpp
+++ b/src/Os.cpp
@@ -262,5 +262,5 @@ Os::globalDataDir()
     }
 
     // System-wide installation
-    return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
+    return "/usr/share/numptyphysics/data";
 }