From 981d0474a1676aedeccba245d2368abaf28c588c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 29 Aug 2008 15:53:46 -0400
Subject: Ignore failure to install files into /etc, in case install is running
 as non-root.

---
 Makefile.PL | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Makefile.PL')

diff --git a/Makefile.PL b/Makefile.PL
index 979483c5a..78e659fe6 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,10 +50,6 @@ extra_clean:
 	$(MAKE) -C po clean
 
 extra_install:
-	install -d $(DESTDIR)/etc/ikiwiki
-	install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
-	install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
-
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
 	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
@@ -96,6 +92,12 @@ extra_install:
 	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
+	
+	# These might fail if a regular user is installing into a home
+	# directory.
+	-install -d $(DESTDIR)/etc/ikiwiki
+	-install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
+	-install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
 }
 }
 
-- 
cgit v1.2.3