From b47b25a72885ac9dbe2346e0ddd9e9a36cfb54d6 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Tue, 4 Jan 2022 21:56:10 +0100
Subject: [PATCH 1/2] Fix generation of wasmer.pc file

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index aa2d1b5bc4b..e60e565acc0 100644
--- a/Makefile
+++ b/Makefile
@@ -713,7 +713,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"; \

From 1b19cf4bd8e23651f8b280e5295de5050d0332d6 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Tue, 4 Jan 2022 23:48:58 +0100
Subject: [PATCH 2/2] Clarify behavior of DESTDIR in the Makefile

---
 PACKAGING.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PACKAGING.md b/PACKAGING.md
index f6a98b218e9..7d32cc809fd 100644
--- 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