--- ajstarks-openvg-a236978e8009c948083bd15b201d8f4ceb3c035d.orig/Makefile	2017-07-26 14:27:15.000000000 +0200
+++ ajstarks-openvg-a236978e8009c948083bd15b201d8f4ceb3c035d/Makefile	2017-07-26 17:07:46.000000000 +0200
@@ -1,38 +1,38 @@
-INCLUDEFLAGS=-I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads -fPIC
-LIBFLAGS=-L/opt/vc/lib -lEGL -lGLESv2 -ljpeg
-FONTLIB=/usr/share/fonts/truetype/ttf-dejavu
+INCLUDEFLAGS=-I=/opt/vc/include -I=/opt/vc/include/interface/vmcs_host/linux -I=/opt/vc/include/interface/vcos/pthreads -fPIC
+LIBFLAGS=-L=/opt/vc/lib -lEGL -lGLESv2 -ljpeg
 FONTFILES=DejaVuSans.inc  DejaVuSansMono.inc DejaVuSerif.inc
+
 all:	font2openvg fonts library	
 
-libshapes.o:	libshapes.c shapes.h fontinfo.h fonts
-	gcc -O2 -Wall $(INCLUDEFLAGS) -c libshapes.c
+libshapes.o:	libshapes.c shapes.h fontinfo.h
+	$(CC) -O2 -Wall $(INCLUDEFLAGS) -c libshapes.c
 
 gopenvg:	openvg.go
 	go install .
 
 oglinit.o:	oglinit.c
-	gcc -O2 -Wall $(INCLUDEFLAGS) -c oglinit.c
+	$(CC) -O2 -Wall $(INCLUDEFLAGS) -c oglinit.c
 
 font2openvg:	fontutil/font2openvg.cpp
-	g++ -I/usr/include/freetype2 fontutil/font2openvg.cpp -o font2openvg -lfreetype
+	$(CXX) -I=/usr/include/freetype2 fontutil/font2openvg.cpp -o font2openvg -lfreetype
 
 fonts:	$(FONTFILES)
 
-DejaVuSans.inc: font2openvg $(FONTLIB)/DejaVuSans.ttf
-	./font2openvg $(FONTLIB)/DejaVuSans.ttf DejaVuSans.inc DejaVuSans
+DejaVuSans.inc: font2openvg DejaVuSans.ttf
+	./font2openvg DejaVuSans.ttf DejaVuSans.inc DejaVuSans
 
-DejaVuSerif.inc: font2openvg $(FONTLIB)/DejaVuSerif.ttf
-	./font2openvg $(FONTLIB)/DejaVuSerif.ttf DejaVuSerif.inc DejaVuSerif
+DejaVuSerif.inc: font2openvg DejaVuSerif.ttf
+	./font2openvg DejaVuSerif.ttf DejaVuSerif.inc DejaVuSerif
 
-DejaVuSansMono.inc: font2openvg $(FONTLIB)/DejaVuSansMono.ttf
-	./font2openvg $(FONTLIB)/DejaVuSansMono.ttf DejaVuSansMono.inc DejaVuSansMono
+DejaVuSansMono.inc: font2openvg DejaVuSansMono.ttf
+	./font2openvg DejaVuSansMono.ttf DejaVuSansMono.inc DejaVuSansMono
 
 clean:
 	rm -f *.o *.inc *.so font2openvg *.c~ *.h~
 	indent -linux -c 60 -brf -l 132  libshapes.c oglinit.c shapes.h fontinfo.h
 
 library: oglinit.o libshapes.o
-	gcc $(LIBFLAGS) -shared -o libshapes.so oglinit.o libshapes.o
+	$(CC) -v $(LIBFLAGS) -shared -o libshapes.so oglinit.o libshapes.o
 
 install:
 	install -m 755 -p font2openvg /usr/bin/