rust: make distcheck fixes

diff --git a/configure.ac b/configure.ac
index 5f587a7277fe8e637a3c8b4e5703da0929024ef1..89016d7d47490133e18a678725d4e2ee7d2c7f11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1965,9 +1965,6 @@
     AM_CONDITIONAL([HAVE_PDFLATEX], [test "x$enable_pdflatex" != "xno"])
 
 # Cargo/Rust.
-    dnl enable_rust="no"
-    dnl AC_ARG_ENABLE(rust, AS_HELP_STRING([--enable-rust], [Enable Rust]),
-    dnl     [enable_rust="$enableval"], [enable_rust=no])
     AC_ARG_ENABLE([rust], AS_HELP_STRING([--enable-rust], [Enable Experimental Rust support]))
 
     rust_vendor_comment="# "
@@ -2004,7 +2001,7 @@
             RUST_SURICATA_LIB="../rust/target/release/libsuricata.a"
           fi
           RUST_LDADD="${RUST_SURICATA_LIB} ${RUST_LDADD}"
-          CFLAGS="${CFLAGS} -I../rust/gen/c-headers"
+          CFLAGS="${CFLAGS} -I\${srcdir}/../rust/gen/c-headers"
           AC_SUBST(RUST_SURICATA_LIB)
           AC_SUBST(RUST_LDADD)
          AC_SUBST([CARGO], [$HAVE_CARGO])

diff --git a/rust/.cargo/config.in b/rust/.cargo/config.in
index cd24b90e2430d27b546f69059da1ab157e140fa1..86b29f81c42045a6dcfbeaafbdcde0009f8ec6a6 100644 (file)
--- a/rust/.cargo/config.in
+++ b/rust/.cargo/config.in
@@ -5,4 +5,4 @@
 @rust_vendor_comment@replace-with = 'vendored-sources'
 @rust_vendor_comment@
 @rust_vendor_comment@[source.vendored-sources]
-@rust_vendor_comment@directory = './vendor'
+@rust_vendor_comment@directory = '@abs_top_srcdir@/rust/vendor'

diff --git a/rust/Makefile.am b/rust/Makefile.am
index 9cf6eec83e25c05a0404d837853ae47a08c985e2..5a7d1215b66c649b473e796789d86d1c05e90359 100644 (file)
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -27,8 +27,9 @@ endif
 
 all-local:
 if HAVE_PYTHON
-       cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
+       cd $(top_srcdir)/rust && \
                $(HAVE_PYTHON) ./gen-c-headers.py && \
+               CARGO_TARGET_DIR=$(abs_builddir)/target \
                CARGO_HOME=$(CARGO_HOME) $(CARGO) build $(RELEASE) $(FROZEN) \
                        --features "$(FEATURES)"
 else
@@ -42,15 +43,14 @@ clean-local:
                CARGO_HOME=$(CARGO_HOME) $(CARGO) clean
 
 distclean-local:
-       rm -rf vendor
-       rm -rf gen
+       rm -rf vendor gen Cargo.lock
 
 check:
        cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
                CARGO_HOME=$(CARGO_HOME) $(CARGO) test
 
 Cargo.lock: Cargo.toml
-       CARGO_HOME=$(CARGO_HOME) $(CARGO) update
+       CARGO_HOME=$(CARGO_HOME) $(CARGO) generate-lockfile
 
 if HAVE_CARGO_VENDOR
 vendor: