--- a/Makefile
+++ b/Makefile
@@ -26,12 +26,12 @@
 #      DHIS(c)  Dynamic Host Information System Release 5
 
 CC=gcc
-CFLAGS=-Wall -I/usr/local/include
-LFLAGS=-L/usr/local/lib
+CFLAGS?=-Wall -g -O2 -pipe
+LDFLAGS?=
 LIBS=
 RM=rm -f
 
-INSTALLDIR=/etc/dhis/bin
+INSTALLDIR=$(DESTDIR)/usr/lib/dhis-server
 MODE=700
 OWNER=root
 MKDIR=mkdir -p
@@ -41,8 +41,8 @@
 
 
 dhis-dns-engine:dhis-dns-engine.c nsupdate.c
-	$(CC) $(CFLAGS) $(LFLAGS) -o dhis-dns-engine nsupdate.c dhis-dns-engine.c $(LIBS)
-	strip dhis-dns-engine
+	$(CC) $(CFLAGS) $(LDFLAGS) -o dhis-dns-engine nsupdate.c dhis-dns-engine.c $(LIBS)
+	#strip dhis-dns-engine
 
 install: dhis-dns-engine
 	$(MKDIR) $(INSTALLDIR)
