From a86540a876ea3177a88d8650ef61ae37da865b6c Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Mon, 10 Sep 2018 14:21:08 -0400
Subject: [PATCH] Update to work on CENTOS.

---
 Makefile            |  7 ++++---
 src/core/core.janet | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 5d85137f..09594b23 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 ##### Set global variables #####
 ################################
 
-PREFIX?=/usr
+PREFIX?=/usr/local
 
 INCLUDEDIR=$(PREFIX)/include/janet
 LIBDIR=$(PREFIX)/lib
@@ -34,8 +34,7 @@ BINDIR=$(PREFIX)/bin
 
 #CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -g
 CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -O2 -fvisibility=hidden
-CLIBS=-lm -ldl
-PREFIX=/usr/local
+CLIBS=-lm -ldl -lrt
 JANET_TARGET=janet
 JANET_LIBRARY=libjanet.so
 DEBUGGER=gdb
@@ -148,9 +147,11 @@ clean:
 	-rm $(JANET_GENERATED_HEADERS)
 
 install: $(JANET_TARGET)
+	mkdir -p $(BINDIR)
 	cp $(JANET_TARGET) $(BINDIR)/$(JANET_TARGET)
 	mkdir -p $(INCLUDEDIR)
 	cp $(JANET_HEADERS) $(INCLUDEDIR)
+	mkdir -p $(LIBDIR)
 	cp $(JANET_LIBRARY) $(LIBDIR)/$(JANET_LIBRARY)
 	$(LDCONFIG)
 
diff --git a/src/core/core.janet b/src/core/core.janet
index 39220776..d9a941c1 100644
--- a/src/core/core.janet
+++ b/src/core/core.janet
@@ -233,8 +233,8 @@
     true
     ((fn aux [i]
        (cond
-         (>= (inc i) len) (get forms i)
-         (tuple 'if (get forms i) (aux (inc i)) false))) 0)))
+         (>= (+ 1 i) len) (get forms i)
+         (tuple 'if (get forms i) (aux (+ 1 i)) false))) 0)))
 
 (defmacro or
   "Evaluates to the last argument if all preceding elements are false, otherwise
@@ -246,14 +246,14 @@
     ((fn aux [i]
        (def fi (get forms i))
        (if
-         (>= (inc i) len) fi
+         (>= (+ 1 i) len) fi
          (do
            (if (atomic? fi)
-             (tuple 'if fi fi (aux (inc i)))
+             (tuple 'if fi fi (aux (+ 1 i)))
              (do
                (def $fi (gensym))
                (tuple 'do (tuple 'def $fi fi)
-                      (tuple 'if $fi $fi (aux (inc i))))))))) 0)))
+                      (tuple 'if $fi $fi (aux (+ 1 i))))))))) 0)))
 
 (defmacro loop
   "A general purpose loop macro."