Merge branch 'master' into test-suite

Conflicts:
	Makefile

diff --git a/Makefile b/Makefile
index 582f0aaa7fdd2978bf9590a1b64d61888c9bae4e..89168d76aa7fa5c8142e3924794d421bb11a46fd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+DESTDIR :=
+PREFIX := /usr/local
+BINDIR := $(PREFIX)/bin
+
 CC     ?= clang
 CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -fno-common
 #turn on tons of warnings if clang is present
@@ -54,9 +58,18 @@ all: gmqcc qcvm test
 
 clean:
        rm -f *.o gmqcc qcvm test *.dat
-       
+
+
 $(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
 main.o: lexer.h
 parser.o: ast.h lexer.h
 ast.o: ast.h ir.h
 ir.o: ir.h
+
+install: install-gmqcc install-qcvm
+install-gmqcc: gmqcc
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  gmqcc   $(DESTDIR)$(BINDIR)/gmqcc
+install-qcvm: qcvm
+       install -d -m755          $(DESTDIR)$(BINDIR)
+       install    -m755  qcvm    $(DESTDIR)$(BINDIR)/qcvm