Ignore failure to install files into /etc, in case install is running as non-root.

diff --git a/Makefile.PL b/Makefile.PL
index 979483c5a510741b8ea827712685d7114b3a701e..78e659fe6f13a42873dc8c45bf4bfab098488978 100755 (executable)
--- 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
 }
 }
 

diff --git a/debian/changelog b/debian/changelog
index 4595c35fb063c8b86c8f5d63b5c34d9faf596248..c6fa4261c8eabe7d0d9a687386801b9657434c1d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (2.63) UNRELEASED; urgency=low
 
   * Set cookies HttpOnly.
   * Typo. Closes: #497003
+  * Ignore failure to install files into /etc, in case install is running as
+    non-root.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 28 Aug 2008 16:08:18 -0400
 

diff --git a/doc/bugs/install_into_home_dir_fails.mdwn b/doc/bugs/install_into_home_dir_fails.mdwn
index ad19f3a6904dffeee7552f25c3f05de81be05a7a..e08b7484c28bf2ba84dbe4b09119e4140b3a396b 100644 (file)
--- a/doc/bugs/install_into_home_dir_fails.mdwn
+++ b/doc/bugs/install_into_home_dir_fails.mdwn
@@ -21,6 +21,8 @@ dunno if it just me, but I had to add PREFIX a few places to get 'perl INSTALL_B
 > hardcoding scripts, and would instead need to record the new variable
 > at build time, like PREFIX is recorded in $installdir.
 >
+> Instead, let's ignore failure of the lines. [[done]]
+> 
 > --[[Joey]]
 
 <pre>