3 files changed, 11 insertions, 2 deletions
diff --git a/CleanReadLine b/CleanReadLine
-Subproject b46e4cf96fbd91be0dadbaa1c966f83223c0422
+Subproject 94dfcc25c243167e91044dcc169ecb28cd25c24
diff --git a/Makefile b/Makefile
index 4ac4243..3fa6c3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,12 @@
 CFLAGS=-std=c99 -Wall -O0 -c
 CLM=clm
-CLMFLAGS=-I CleanReadLine -l -lreadline -l compile.o -nr -nt
+CLMFLAGS=\
+	-I $$CLEAN_HOME/lib/clean-platform/OS-Independent\
+	-I $$CLEAN_HOME/lib/Generics\
+	-I CleanReadLine\
+	-l -lreadline\
+	-l compile.o\
+	-nr -nt
 
 all: iclean
 
@@ -15,7 +21,7 @@ iclean: compile.o iclean.icl readline ExtraString.*
 	$(CLM) $(CLMFLAGS) iclean -o iclean
 
 readline: FORCE
-	make -C CleanReadLine
+	$(MAKE) -C CleanReadLine readline
 
 run: iclean
 	./iclean
diff --git a/iclean.icl b/iclean.icl
index e1eb385..4c84509 100644
--- a/iclean.icl
+++ b/iclean.icl
@@ -28,7 +28,10 @@ SOFTWARE.
 module iclean
 
 import StdEnv
+import Data.Maybe
+
 import ReadLine
+
 import ExtraString
 
 // SETTINGS