Merge #2743

2743: Fix generation of wasmer.pc file r=Amanieu a=Amanieu Partially fixes #2740 Co-authored-by: Amanieu d'Antras <[email protected]>
wasmerio · Jan 4, 2022 · a9da483 · a9da483
2 parents 7701ea9 + 1b19cf4
commit a9da483
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -714,7 +714,7 @@ install-misc:
 install-pkgconfig:
 	# Make sure WASMER_INSTALL_PREFIX is set during build
 	unset WASMER_DIR; \
-	if pc="$$(target/release/wasmer config --pkg-config 1>/dev/null 2>/dev/null)"; then \
+	if pc="$$(target/release/wasmer config --pkg-config 2>/dev/null)"; then \
 		echo "$$pc" | install -Dm644 /dev/stdin "$(DESTDIR)"/lib/pkgconfig/wasmer.pc; \
 	else \
 		echo 1>&2 "WASMER_INSTALL_PREFIX was not set during build, not installing wasmer.pc"; \

diff --git a/PACKAGING.md b/PACKAGING.md
@@ -13,12 +13,13 @@
   ```
 
 * `make install` respects `DESTDIR`, but `prefix` must be configured
-  with `WASMER_INSTALL_PREFIX`, e.g.:
+  with `WASMER_INSTALL_PREFIX`. Note that `DESTDIR` must include
+  `WASMER_INSTALL_PREFIX`, e.g.:
 
   ```sh
   export WASMER_INSTALL_PREFIX=/usr
   make
-  DESTDIR=.../usr make install
+  DESTDIR=/tmp/staging/usr make install
   ```
 
 * In case you must build/install directly with `cargo`, make sure to