- fixed "extras" typo (should be "extra")

- avoid always reconfiguring due to dumb Make

diff --git a/debian/rules b/debian/rules
index d5bf93f7d7b8eb5b050e9f447e619c0e43d601f1..17ab4a041a9bcd7d04e21108a03816c22356d03e 100755 (executable)
--- 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