From dbcbb4466dbab9d101cc4bb4f65b6f8151013cef Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Mon, 18 Feb 2019 22:25:40 -0500
Subject: [PATCH] We don't need to add module/\*headerpath\*.

We can just dump janet.h into the lib folder as well.
---
 Makefile            | 2 +-
 src/core/core.janet | 4 ----
 tools/cook.janet    | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index f8dbc8c1..2e5e2135 100644
--- a/Makefile
+++ b/Makefile
@@ -221,9 +221,9 @@ install: $(JANET_TARGET)
 	cp $(JANET_TARGET) $(BINDIR)/janet
 	mkdir -p $(INCLUDEDIR)
 	cp $(JANET_HEADERS) $(INCLUDEDIR)
-	# For compatibility
 	mkdir -p $(INCLUDEDIR)/janet
 	ln -sf $(INCLUDEDIR)/janet.h $(INCLUDEDIR)/janet/janet.h
+	ln -sf $(INCLUDEDIR)/janet.h $(JANET_PATH)/janet.h
 	mkdir -p $(JANET_PATH)
 	cp tools/cook.janet $(JANET_PATH)
 	cp tools/highlight.janet $(JANET_PATH)
diff --git a/src/core/core.janet b/src/core/core.janet
index 18e9f0cd..9185512c 100644
--- a/src/core/core.janet
+++ b/src/core/core.janet
@@ -1605,10 +1605,6 @@ value, one key will be ignored."
   on Windows is C:/Janet/Library."
   (or (os/getenv "JANET_PATH") ""))
 
-(var module/*headerpath*
-  "The path where janet/janet.h is located."
-  (or (os/getenv "JANET_INCLUDEDIR") ""))
-
 (defn- fexists [path]
   (def f (file/open path))
   (if f (do (file/close f) path)))
diff --git a/tools/cook.janet b/tools/cook.janet
index 97d24fa6..28597eca 100644
--- a/tools/cook.janet
+++ b/tools/cook.janet
@@ -96,7 +96,7 @@
 (def LD (if is-win "link" (string CC " -shared")))
 (def CFLAGS (string
               (if is-win "/I" "-I")
-              module/*headerpath*
+              module/*syspath*
               (if is-win " /O" " -std=c99 -Wall -Wextra -fpic -O")
               OPTIMIZE))