[Pkg-ocaml-maint-commits] r3842 - /trunk/packages/ocaml/trunk/debian/rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sat Jun 16 09:54:16 2007
New Revision: 3842

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3842
Log:
- fixed "extras" typo (should be "extra")
- avoid always reconfiguring due to dumb Make

Modified:
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=3842&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Sat Jun 16 09:54:16 2007
@@ -53,6 +53,7 @@
 	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 @@
 		--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 @@
 
 	# 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