aboutsummaryrefslogtreecommitdiff
path: root/Makefile.PL
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-29 15:53:46 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-29 15:53:46 -0400
commit981d0474a1676aedeccba245d2368abaf28c588c (patch)
treee724865b7e6db5c0b18b3200b0c50513abfb9101 /Makefile.PL
parentef3d080a9ace3f8e0c985b737ededf6d6f1285ad (diff)
downloadikiwiki-981d0474a1676aedeccba245d2368abaf28c588c.tar
ikiwiki-981d0474a1676aedeccba245d2368abaf28c588c.tar.gz
Ignore failure to install files into /etc, in case install is running as non-root.
Diffstat (limited to 'Makefile.PL')
-rwxr-xr-xMakefile.PL10
1 files changed, 6 insertions, 4 deletions
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
}
}