From 418b6bac49039fb4edbfefec6bbecdb48306503c Mon Sep 17 00:00:00 2001
From: Luca Saiu <positron@pep.foundation>
Date: Fri, 12 Nov 2021 10:55:14 +0100
Subject: [PATCH] minor build system changes

---
 src/Makefile  | 7 +++++--
 test/Makefile | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a6a94d09..f7dae723 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -92,9 +92,11 @@ all: $(TARGET)
 	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
-# If only the goal 'clean' is given, do not generate and include the '%.d' files.
+# Do not generate and include the '%.d' files if cleaning or uninstalling.
 ifneq ($(MAKECMDGOALS),clean)
-    -include $(DEPENDS)
+    ifneq ($(MAKECMDGOALS),uninstall)
+        -include $(DEPENDS)
+    endif
 endif
 
 $(TARGET): libpEpEngine.a
@@ -129,6 +131,7 @@ install_headers: $(TARGET)
 	cp $(HEADERS_TO_INSTALL) $(DESTDIR)$(PREFIX)/include/pEp/
 
 # FIXME: Does anyone but Roker use install_headers? Otherwise, remove the dependency.
+#        I occasionally use it.  --positron
 install: $(TARGET) install_headers
 	mkdir -p "$(DESTDIR)$(PREFIX)/lib/"
 	cp -v $< $(DESTDIR)$(PREFIX)/lib/
diff --git a/test/Makefile b/test/Makefile
index ce987762..97d31e88 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -96,6 +96,10 @@ else
     LIBPATH=LD_LIBRARY_PATH
 endif
 
+# The LIBPATH variable, whatever it is, should have the value of EXTRA_LIB_PATHS
+# *prepended* to it -- without the rest of the path being lost.  This allows the
+# user to use manually-installed version of some dependency libraries rather
+# than system libraries.
 TEST_CMD_PFX=$(LIBPATH)="$(EXTRA_LIB_PATHS):$$$(LIBPATH)"
 ifeq ($(TEST_CMD_PFX),)
     TEST_CMD_PFX=