From fb5af2c54f2a27c1154d64fe4d111003ce5fcb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 5 Mar 2017 12:37:29 +0100
Subject: Enhancement Makefile and add support for DESTDIR

---
 Makefile        | 19 ++++++++++---------
 po/Makefile     |  7 +++----
 polkit/Makefile | 10 ++++++----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index d5cdc508..b7b36616 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,19 @@ MGAUPDATE = mgaupdate
 MGAAPPLET = mgaapplet
 SUBDIRS = po polkit
 
-PREFIX = /
-DATADIR = $(PREFIX)/usr/share
+DESTDIR =
+PREFIX = $(DESTDIR)/usr
+BINDIR = $(PREFIX)/bin
+DATADIR = $(PREFIX)/share
 ICONSDIR = $(DATADIR)/icons
-LIBEXECDIR = $(PREFIX)/usr/libexec
-BINDIR = $(PREFIX)/usr/bin
-FBLIBDIR = $(PREFIX)/usr/lib/libDrakX/drakfirsttime
-SYSCONFDIR = $(PREFIX)/etc/sysconfig
+LOCALEDIR = $(DATADIR)/locale
+LIBEXECDIR = $(PREFIX)/libexec
+FBLIBDIR = $(PREFIX)/lib/libDrakX/drakfirsttime
+SYSCONFDIR = $(DESTDIR)/etc/sysconfig
 SBINREL = ../sbin
 
-localedir = $(PREFIX)/usr/share/locale
 
-override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(localedir)\"
+override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
 
 all:
 	(find -name '*.pm' -o -name mgaapplet\* -o -name mgaupdate -o -name mgaonline_agent.pl -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
@@ -29,7 +30,7 @@ clean:
 	find . -name '*~' | xargs rm -f
 
 install: all
-	install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime}
+	install -d $(PREFIX)/{bin,libexec,share/{mime/packages,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime}
 	install -m755 $(MGAUPDATE) $(MGAAPPLET)-config $(MGAAPPLET)-upgrade-helper $(LIBEXECDIR)
 	install -m755 $(MGAAPPLET) $(MGAAPPLET)-update-checker $(BINDIR)
 	install -d $(SYSCONFDIR)
diff --git a/po/Makefile b/po/Makefile
index a7b7c34b..010ffca0 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,5 +1,5 @@
 # Installation directories
-localedir = $(PREFIX)/usr/share/locale
+LOCALEDIR = $(DESTDIR)/usr/share/locale
 
 PGOAL = mgaonline
 
@@ -16,8 +16,8 @@ all: $(GOALS)
 
 install: all
 	for l in $(LANGS); do \
-		install -d $(localedir)/$$l/LC_MESSAGES; \
-		install -m 644 $$l.mo $(localedir)/$$l/LC_MESSAGES/$(PGOAL).mo; \
+		install -d $(LOCALEDIR)/$$l/LC_MESSAGES; \
+		install -m 644 $$l.mo $(LOCALEDIR)/$$l/LC_MESSAGES/$(PGOAL).mo; \
 	done
 
 clean:
@@ -43,4 +43,3 @@ merge:
 		msgmerge "$$n" $(PGOAL).pot > "$$n"t; \
 		mv -f "$$n"t "$$n"; \
 	done
-
diff --git a/polkit/Makefile b/polkit/Makefile
index 11591ddc..3ea36b94 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -1,7 +1,9 @@
-BINDIR = /usr/bin
-LIBEXECDIR = /usr/libexec
-BINDEST = $(PREFIX)$(BINDIR)
-POLKITPOLICYDEST = $(PREFIX)/usr/share/polkit-1/actions
+DESTDIR =
+PREFIX = /usr
+BINDIR = $(PREFIX)/bin
+BINDEST = $(DESTDIR)$(BINDIR)
+LIBEXECDIR = $(PREFIX)/libexec
+POLKITPOLICYDEST = $(DESTDIR)$(PREFIX)/share/polkit-1/actions
 
 POLICY_IN := $(wildcard *.policy.in)
 POLICY = $(POLICY_IN:.policy.in=.policy)
-- 
cgit v1.2.1