From 6f6acf57255a7602235792c248d5d4926794395a Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 22 Feb 2022 23:41:19 +0100
Subject: Makefile: Improve DESTDIR= handling.

Per https://www.gnu.org/prep/standards/html_node/DESTDIR.html .
---
 Makefile | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 7db373d..2cff2e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 srcdir ?= .
-DESTDIR ?= /usr/local
 BUILD_DOCDIR ?= $(srcdir)/doc
 CSS ?= /usr/share/javascript/bootstrap4/css/bootstrap.css
 HTML_TEMPLATE ?= $(srcdir)/doc/template.html
@@ -56,7 +55,7 @@ INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
 INSTALL_DATA ?= $(INSTALL) -m0644
 
-prefix ?= $(DESTDIR)
+prefix ?= /usr/local
 exec_prefix ?= $(prefix)
 bindir ?= $(exec_prefix)/bin
 libdir ?= $(exec_prefix)/lib
@@ -65,19 +64,19 @@ mandir ?= $(datarootdir)/man
 man1dir ?= $(mandir)/man1
 
 install: all
-	$(INSTALL_PROGRAM) -vDt $(bindir) $(srcdir)/interimap $(srcdir)/pullimap
-	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
-	$(INSTALL_DATA) -vDt $(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
-	$(INSTALL_DATA) -vDt $(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
-	$(INSTALL_DATA) -vDt $(datarootdir)/doc/interimap $(srcdir)/interimap.sample $(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md README
-	$(INSTALL_DATA) -vDt $(libdir)/systemd/user $(srcdir)/*.service
+	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(srcdir)/interimap $(srcdir)/pullimap
+	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/interimap $(srcdir)/interimap.sample \
+		$(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md $(srcdir)/README
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(libdir)/systemd/user $(srcdir)/*.service
 
 uninstall:
-	rm -vf -- $(bindir)/interimap $(man1dir)/interimap.1 $(libdir)/systemd/user/interimap*.service
-	rm -vf -- $(bindir)/pullimap $(man1dir)/pullimap.1 $(libdir)/systemd/user/pullimap*.service
-	rm -vf -- $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
-	rm -rvf -- $(datarootdir)/doc/interimap $(datarootdir)/doc/pullimap
-	rm -vf -- $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
+	rm -vf -- $(DESTDIR)$(bindir)/interimap $(DESTDIR)$(man1dir)/interimap.1 $(DESTDIR)$(libdir)/systemd/user/interimap*.service
+	rm -vf -- $(DESTDIR)$(bindir)/pullimap $(DESTDIR)$(man1dir)/pullimap.1 $(DESTDIR)$(libdir)/systemd/user/pullimap*.service
+	rm -vf -- $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+	rm -rvf -- $(DESTDIR)$(datarootdir)/doc/interimap $(DESTDIR)$(datarootdir)/doc/pullimap
 
 clean:
 	rm -vf -- $(MANUAL_FILES) $(HTML_FILES)
-- 
cgit v1.2.3