[Pkg-ocaml-maint-commits] r2541 - trunk/packages/advi/trunk/debian

[Julien Cristau]

Author: jcristau-guest
Date: 2006-01-24 21:58:47 +0000 (Tue, 24 Jan 2006)
New Revision: 2541

Modified:
   trunk/packages/advi/trunk/debian/changelog
   trunk/packages/advi/trunk/debian/rules
Log:
Modify debian/rules to try not to build a broken package, and fail if
there is an error in the build process.


Modified: trunk/packages/advi/trunk/debian/changelog
===================================================================
--- trunk/packages/advi/trunk/debian/changelog	2006-01-24 21:24:01 UTC (rev 2540)
+++ trunk/packages/advi/trunk/debian/changelog	2006-01-24 21:58:47 UTC (rev 2541)
@@ -1,9 +1,14 @@
 advi (1.6.0-8) unstable; urgency=low
 
+  [ Samuel Mimram ]
   * Adapt the build targets to the new patch.
 
- -- Samuel Mimram <smimram at debian.org>  Tue, 24 Jan 2006 22:16:49 +0100
+  [ Julien Cristau ]
+  * Modify debian/rules to try not to build a broken package, and fail if
+    there is an error in the build process.
 
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Tue, 24 Jan 2006 22:57:55 +0100
+
 advi (1.6.0-7) unstable; urgency=low
 
   * Rebuild for ocaml 3.09.1.

Modified: trunk/packages/advi/trunk/debian/rules
===================================================================
--- trunk/packages/advi/trunk/debian/rules	2006-01-24 21:24:01 UTC (rev 2540)
+++ trunk/packages/advi/trunk/debian/rules	2006-01-24 21:58:47 UTC (rev 2541)
@@ -29,6 +29,9 @@
 		test/trans3.dvi        \
 		test/trigo_source.dvi
 
+OPTOPT = $(shell test -x /usr/bin/ocamlopt.opt && echo true)
+OPT = $(shell test -x /usr/bin/ocamlopt && echo true)
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -61,18 +64,18 @@
 	dh_testdir
 
 	$(MAKE) dep
-	if [ -x /usr/bin/ocamlopt.opt ]; then \
-		echo "Building the native code version with the native compilers"; \
-	        $(MAKE) HAVE_OPT=".opt" bin; \
-		touch opt-built-stamp; \
-	else if [ -x /usr/bin/ocamlopt ]; then \
-		echo "Building the native code version"; \
-	        $(MAKE) HAVE_OPT="" bin; \
-		touch opt-built-stamp; \
-	else \
-		echo "Building the bytecode version"; \
-	        $(MAKE) byt; \
-	fi fi
+ifeq ($(OPTOPT),true)
+	@echo "Building the native code version with the native compilers"
+	$(MAKE) HAVE_OPT=".opt" bin
+	touch opt-built-stamp
+else ifeq ($(OPT),true)
+	@echo "Building the native code version"
+	$(MAKE) HAVE_OPT="" bin
+	touch opt-built-stamp
+else
+	@echo "Building the bytecode version"
+	$(MAKE) byt
+endif
 	$(MAKE) doc
 	ln -s tex/advilogo.eps test/
 	#ln -s tex/bar.eps test/