[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090601.beta1+dfsg-1-19-g4b31c19

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 5e99f1b24c50c42c4f454ff29c50cce08b03f844
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Sep 10 13:09:34 2009 +0200

    Fix datadir path

diff --git a/debian/rules b/debian/rules
index ddfcdd9..764f4de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ export DH_VERBOSE=1
 
 include /usr/share/ocaml/ocamlinit.mk
 
+FRAMA_DIR=$(CURDIR)/debian/frama-c
+
 override_dh_auto_configure: ocamlinit-stamp
 	mkdir -p lib/plugins
 	mkdir -p lib/gui
@@ -13,7 +15,7 @@ override_dh_auto_configure: ocamlinit-stamp
 	./configure $(CROSS) --prefix=/usr       \
 		--mandir=\$${prefix}/share/man   \
 		--infodir=\$${prefix}/share/info \
-		--datarootdir=\$${prefix}/lib    \
+		--datarootdir=\$${prefix}/share  \
 		--with-why-dir=no		 \
 		--with-jessie-static		 \
 		--disable-impact		 \
@@ -26,7 +28,7 @@ override_dh_auto_build:
 	$(MAKE) $(OCAML_BEST) bin/toplevel.byte bin/viewer.$(OCAML_BEST)
 
 override_dh_auto_install:
-	$(MAKE) prefix=$(CURDIR)/debian/frama-c/usr install
+	$(MAKE) prefix=$(FRAMA_DIR)/usr FRAMAC_DATADIR=$(FRAMA_DIR)/usr/share/frama-c install
 	cp debian/icons/frama-c.svg $(CURDIR)/debian/frama-c/usr/share/icons/hicolor/scalable/apps/
 	cp debian/icons/frama-c.xpm $(CURDIR)/debian/frama-c/usr/share/pixmaps/
 	cp debian/frama-c.desktop $(CURDIR)/debian/frama-c/usr/share/applications/

-- 
frama-c packaging