From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 20 Sep 2019 21:58:53 +0000 (-0600)
Subject: rust: fix build when source directory has spaces in it
X-Git-Tag: suricata-5.0.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e981fd15a6a6e7277fef8078d6736f0d2c9db25;p=thirdparty%2Fsuricata.git

rust: fix build when source directory has spaces in it

Redmine issue:
https://redmine.openinfosecfoundation.org/issues/2668
---

diff --git a/rust/Makefile.am b/rust/Makefile.am
index c7482fcb85..3e7ec2eebc 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -34,14 +34,14 @@ endif
 if HAVE_CYGPATH
 	rustpath=`cygpath -a -t mixed $(abs_top_builddir)`
 	cd $(top_srcdir)/rust && \
-		CARGO_HOME=$(CARGO_HOME) \
+		CARGO_HOME="$(CARGO_HOME)" \
 		CARGO_TARGET_DIR="$$rustpath/rust/target" \
 		$(CARGO) build $(RELEASE) $(FROZEN) \
 			--features "$(RUST_FEATURES)"
 else
 	cd $(top_srcdir)/rust && \
-		CARGO_HOME=$(CARGO_HOME) \
-		CARGO_TARGET_DIR=$(abs_top_builddir)/rust/target \
+		CARGO_HOME="$(CARGO_HOME)" \
+		CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \
 		$(CARGO) build $(RELEASE) $(FROZEN) \
 			--features "$(RUST_FEATURES)"
 endif
@@ -53,14 +53,14 @@ distclean-local: clean-local
 	rm -rf vendor gen Cargo.lock
 
 check:
-	CARGO_HOME=$(CARGO_HOME) $(CARGO) test
+	CARGO_HOME="$(CARGO_HOME)" $(CARGO) test
 
 Cargo.lock: Cargo.toml
-	CARGO_HOME=$(CARGO_HOME) $(CARGO) generate-lockfile
+	CARGO_HOME="$(CARGO_HOME)" $(CARGO) generate-lockfile
 
 if HAVE_CARGO_VENDOR
 vendor:
-	CARGO_HOME=$(CARGO_HOME) $(CARGO) vendor > /dev/null
+	CARGO_HOME="$(CARGO_HOME)" $(CARGO) vendor > /dev/null
 else
 vendor:
 endif