From 87b5712ebac878324a2476864810f63cf8e56c5f Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Sun, 25 Feb 2018 09:59:47 +0000
Subject: [PATCH] Sync runtop and natruntop and add otherlibs

RUNTOP and NATRUNTOP now include the same directories and include all
the directories in otherlibs.
---
 Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1eecdab65..4a68079b0 100644
--- a/Makefile
+++ b/Makefile
@@ -280,11 +280,18 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDIR)
 INSTALL_MANDIR=$(DESTDIR)$(MANDIR)
 INSTALL_FLEXDLL=$(INSTALL_LIBDIR)/flexdll
 
+TOPINCLUDES=-I otherlibs/$(UNIXLIB) \
+  -I otherlibs/bigarray \
+  -I otherlibs/dynlink \
+  -I otherlibs/str \
+  -I otherlibs/$(GRAPHLIB) \
+  -I otherlibs/raw_spacetime_lib
 RUNTOP=./byterun/ocamlrun ./ocaml \
   -nostdlib -I stdlib \
-  -noinit $(TOPFLAGS) \
-  -I otherlibs/$(UNIXLIB)
-NATRUNTOP=./ocamlnat$(EXE) -nostdlib -I stdlib -noinit $(TOPFLAGS)
+  -noinit $(TOPFLAGS) $(TOPINCLUDES)
+NATRUNTOP=./ocamlnat$(EXE) \
+  -nostdlib -I stdlib \
+  -noinit $(TOPFLAGS) $(TOPINCLUDES)
 ifeq "$(UNIX_OR_WIN32)" "unix"
 EXTRAPATH=
 else