From fc10fee6c2d6bad21cac2e9bc06ec47e8d1b3c7b Mon Sep 17 00:00:00 2001
From: Gautier Hattenberger <gautier.hattenberger@enac.fr>
Date: Sun, 3 Jan 2016 15:28:04 +0100
Subject: [PATCH] [pprzlink] update ocaml lib install

---
 Makefile        | 14 +++++++-------
 sw/ext/pprzlink |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 9df2fb15c2e..38f0f94b96a 100644
--- a/Makefile
+++ b/Makefile
@@ -91,8 +91,9 @@ XSENS_XML = $(CONF)/xsens_MTi-G.xml
 #
 # generated header files
 #
-MESSAGES_INSTALL=$(PAPARAZZI_HOME)/var
 PPRZLINK_DIR=sw/ext/pprzlink
+PPRZLINK_INSTALL=$(PAPARAZZI_HOME)/var/lib/ocaml
+MESSAGES_INSTALL=$(PAPARAZZI_HOME)/var
 UBX_PROTOCOL_H=$(STATICINCLUDE)/ubx_protocol.h
 MTK_PROTOCOL_H=$(STATICINCLUDE)/mtk_protocol.h
 XSENS_PROTOCOL_H=$(STATICINCLUDE)/xsens_protocol.h
@@ -136,7 +137,10 @@ ground_segment.opt: ground_segment cockpit.opt tmtc.opt
 
 static: cockpit tmtc generators sim_static joystick static_h
 
-libpprz: _save_build_version
+libpprzlink:
+	DESTDIR=$(PPRZLINK_INSTALL) $(MAKE) -C $(PPRZLINK_DIR) libpprzlink-install
+
+libpprz: libpprzlink _save_build_version
 	$(MAKE) -C $(LIB)/ocaml
 
 multimon:
@@ -183,11 +187,7 @@ $(LOGALIZER): libpprz
 
 static_h: pprzlink_protocol $(GEN_HEADERS)
 
-pprzlink:
-	@echo BUILD PPRZLINK
-	$(Q)$(MAKE) -C $(PPRZLINK_DIR) generators
-
-pprzlink_protocol : $(MESSAGES_XML) pprzlink
+pprzlink_protocol : $(MESSAGES_XML)
 	$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
 	$(Q)test -d $(STATICLIB) || mkdir -p $(STATICLIB)
 	@echo GENERATE $@
diff --git a/sw/ext/pprzlink b/sw/ext/pprzlink
index bd35b440f93..0085bf09898 160000
--- a/sw/ext/pprzlink
+++ b/sw/ext/pprzlink
@@ -1 +1 @@
-Subproject commit bd35b440f939ee27a962719cb094249871cee376
+Subproject commit 0085bf098986d2a362777dff51e1ded6964113d1