From: Stefano Zacchiroli <zack@debian.org>
Date: Sat, 16 Jun 2007 09:54:16 +0000 (+0000)
Subject: - fixed "extras" typo (should be "extra")
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~573
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d3a8a661c5889425abf4b6b4a70efa8cc78d6ab7;p=ocaml.git

- fixed "extras" typo (should be "extra")
- avoid always reconfiguring due to dumb Make
---

diff --git a/debian/rules b/debian/rules
index d5bf93f7..17ab4a04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ debian/control:
 	sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@
 
 pre-config: debian/$(DISTDIR).tar.bz2
+	touch $@
 debian/$(DISTDIR).tar.bz2:
 	ln -fs . $(DISTDIR)	# beware of the symlink recursion!
 	tar --anchored -chjf debian/$(DISTDIR).tar.bz2 \
@@ -60,7 +61,7 @@ debian/$(DISTDIR).tar.bz2:
 		--exclude-from=debian/ocaml-source.exclude \
 		$(DISTDIR)/
 
-config-stamp: configure pre-config patch-stamp abi-sed
+config-stamp: pre-config patch-stamp abi-sed
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure --with-pthread -prefix /usr				\
@@ -179,12 +180,12 @@ install-arch: build-arch
 
 	# Move away camlp4 stuff
 	if [ -e opt-built-stamp ]; then					\
-		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extras \
+		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extra \
 			`cat debian/camlp4-extra.optfiles` ; \
 		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4 \
 			`cat debian/camlp4.optfiles` ; \
 	else \
-		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extras ; \
+		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extra ; \
 		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4 ; \
 	fi