[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-1-1-gf6ecf83

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 784486fdd8383665d147ff4d9ec1bbaf5b88095b
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Apr 4 20:02:28 2010 +0200

    further simplify debian/rules

diff --git a/debian/rules b/debian/rules
index 62044df..1319643 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,9 @@
 #!/usr/bin/make -f
 
-# additional dvi documents to generate
-DVIS = splash.dvi scratch_draw_splash.dvi  scratch_write_splash.dvi
-
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-# determine what kind of ocaml compiler we have
-OPT    = $(shell test -x /usr/bin/ocamlopt && echo true)
-
+OPT                 = $(shell test -x /usr/bin/ocamlopt && echo true)
 
 %:
 	dh $@ --with tex,ocaml
@@ -22,10 +16,6 @@ override_dh_auto_configure:
 			--infodir=\$${prefix}/share/info \
 			--with-gs=/usr/bin/ghostscript
 
-#override_dh_auto_build:
-#	$(MAKE)
-#	cd doc && $(MAKE) $(DVIS)
-
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/advi
 ifeq ($(OPT),true)
@@ -34,7 +24,10 @@ else
 	cd $(CURDIR)/debian/advi/usr/bin && mv -f advi.byt advi
 endif
 
-# when compiling to bytecode then do not strip the executable (bug #500286).
+# Do not strip the executable when compiling to bytecode (bug #500286).
 # This should be dropped as soon as bytecode compilation can be done without
 # using the -custom option (see bug #517546).
 override_dh_strip:
+ifeq ($(OPT),true)
+	dh_strip
+endif
\ No newline at end of file

-- 
advi packaging