[Pkg-ocaml-maint-commits] r2573 - trunk/packages/mldonkey/trunk/debian

[Sylvain LE GALL]

Author: gildor
Date: 2006-02-16 23:18:44 +0000 (Thu, 16 Feb 2006)
New Revision: 2573

Modified:
   trunk/packages/mldonkey/trunk/debian/changelog
   trunk/packages/mldonkey/trunk/debian/rules
Log:
Prepare release, do not use ocamlopt for generation on alpha -- SLG


Modified: trunk/packages/mldonkey/trunk/debian/changelog
===================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog	2006-02-13 22:23:38 UTC (rev 2572)
+++ trunk/packages/mldonkey/trunk/debian/changelog	2006-02-16 23:18:44 UTC (rev 2573)
@@ -1,3 +1,10 @@
+mldonkey (2.7.3-2) unstable; urgency=low
+
+  * Fix the build on alpha by using a workaround when opt compilation
+    has failed (Closes: #345793)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Tue, 14 Feb 2006 23:07:53 +0100
+
 mldonkey (2.7.3-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/mldonkey/trunk/debian/rules
===================================================================
--- trunk/packages/mldonkey/trunk/debian/rules	2006-02-13 22:23:38 UTC (rev 2572)
+++ trunk/packages/mldonkey/trunk/debian/rules	2006-02-16 23:18:44 UTC (rev 2573)
@@ -53,22 +53,25 @@
 build-arch-stamp: configure-stamp 
 	dh_testdir
 
-	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
-		$(MAKE) utils opt;\
+	@if ([ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]) && $(MAKE) utils opt; then\
 		/usr/bin/chrpath -d mlgui;\
 		/usr/bin/chrpath -d mlguistarter;\
+		touch build-arch-opt;\
 	else\
 		$(MAKE) utils.byte byte;\
 		cp mlnet.byte mlnet;\
 		cp mlgui.byte mlgui;\
 		cp mlguistarter.byte mlguistarter;\
+		touch build-arch-byte;\
 	fi
 	# Check that the compilation has succeeded
 	test -x mlnet
 	test -x mlgui
+	chrpath -d mlgui
+	chrpath -d mlguistarter
 
 	# Compile utilities
-	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
+	@if [ -e build-arch-opt ]; then\
 		cd debian/utils && $(MAKE) opt;\
 	else\
 		cd debian/utils && $(MAKE) byte;\
@@ -101,7 +104,7 @@
 	-$(RM) config/trying
 	-$(RM) packages/rpm/Makefile
 	-$(RM) *.ini *.ini.old
-	-$(RM) configure-stamp build-arch-stamp build-indep-stamp 
+	-$(RM) configure-stamp build-arch-stamp build-indep-stamp build-arch-opt build-arch-byte
 	dh_clean
 
 install: DH_OPTIONS=
@@ -159,7 +162,7 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
+	@if [ -e build-arch-opt ]; then\
 		echo "interpreter:Depends=" >> debian/mldonkey-server.substvars;\
 		echo "interpreter:Depends=" >> debian/mldonkey-gui.substvars;\
 		dh_strip -a;\