--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,28 @@
 CC=gcc
+CFLAGS?=-Wall
+CPPFLAGS?=
+LDFLAGS?=
+
+INSTALLDIR=$(DESTDIR)/usr/sbin
 
 all: genpass genkeys genid
 
 install: all
-	cp genpass genkeys genid /etc/dhis/bin
+	mkdir -p $(INSTALLDIR)
+	install genpass $(INSTALLDIR)/dhis-genpass
+	install genkeys $(INSTALLDIR)/dhis-genkeys
+	install genid $(INSTALLDIR)/dhis-genid
+	install register-p.sh $(INSTALLDIR)/dhis-register-p
+	install register-q.sh $(INSTALLDIR)/dhis-register-q
 
 genpass: genpass.c
-	$(CC) -Wall -o genpass genpass.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o genpass genpass.c
 
 genkeys: genkeys.c 
-	$(CC) -Wall -o genkeys genkeys.c -I/usr/local/include -L/usr/local/lib -lgmp
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o genkeys genkeys.c -lgmp
 
 genid: genid.c
-	$(CC) -Wall -o genid genid.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o genid genid.c
 
 clean: 
 	rm -f core *.core genkeys genpass genid
