Fix for installation issues

drop weird dependency camlp4lib

Author: BYVoid

Makefile

@@ -2,13 +2,17 @@ build: _obuild
 	ocp-build build batsh
 	ln -sf _obuild/batsh/batsh.asm batsh
 
-LIBDIR=$(CAML_LD_LIBRARY_PATH)/../batsh
+LIBDIR=$(CAML_LD_LIBRARY_PATH)/..
+BATSHDIR=$(LIBDIR)/batsh
 
 install: build
-	ocp-build install -install-lib "$(LIBDIR)"
+	ocp-build install batsh-lib batsh -install-lib "$(LIBDIR)"
+	# This is an unly wordaround for fixing the generated META file
+	sed -i 's/ camlp4lib//g' "$(LIBDIR)/META.batsh"
+	sed -i 's/ camlp4lib//g' "$(LIBDIR)/META.batsh-lib"
 
 uninstall:
-	ocp-build uninstall -install-lib "$(LIBDIR)"
+	ocp-build uninstall
 
 test: build
 	ocp-build build test

src/batsh.ocp

@@ -30,6 +30,7 @@ begin library "batsh-lib"
     "winbat_transform.ml"
   ]
   requires = ["core_kernel" "dlist" "sexplib-syntax"]
+  bundle = [ "batsh" ]
 end
 
 begin program "batsh"
@@ -73,7 +74,7 @@ begin
     dirname = ["%{type_conv_DST_DIR}%"]
     begin library "pa_type_conv"
       is_before = ["pa_macro"]
-      requires = ["camlp4lib" "camlp4-pa-o" "camlp4-pa-op"]
+      requires = ["camlp4-pa-o" "camlp4-pa-op"]
       files = ["pa_type_conv.ml"]
     end
     begin syntax "pa_type_conv.syntax"