From 7c5cec57b4d219a5835b1c91af4e920516a3aa62 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Mon, 7 Oct 2013 09:00:26 +0200
Subject: [PATCH] Make sure 'make all' do not need privileges, and 'make
 install' do not try to change stuff outside $(DESTDIR).  This make sure
 debian packaging is possible.

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3fa1e3182..493e2c2c1 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ DATADIR=/usr/share/plinth
 PYDIR=$(DATADIR)/python/plinth
 
 ## Catch-all tagets
-default: config dirs template css docs dbs apache-config
+default: config dirs template css docs dbs
 all: default
 
 predepend:
@@ -22,7 +22,7 @@ predepend:
 	git submodule update
 	touch predepend
 
-install: default
+install: default apache-install
 	mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/etc/plinth
 	cp plinth.sample.fhs.config $(DESTDIR)/etc/plinth/plinth.config
 	mkdir -p $(DESTDIR)$(PYDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)/usr/bin \
@@ -93,8 +93,9 @@ current-checkout.tar.gz: $(ALL_BUT_GZ)
 current-repository.tar.gz: $(ALL_BUT_GZ)
 	tar cz $(EXCLUDE) * .git > current-repository.tar.gz
 
-apache-config: apache-ssl
-	cp share/apache/plinth.conf /etc/apache/sites-available/plinth.conf
+apache-install:
+	cp share/apache/plinth.conf $(DESTDIR)/etc/apache/sites-available/plinth.conf
+apache-config: apache-install apache-ssl
 	a2ensite plinth
 
 apache-ssl: