summaryrefslogtreecommitdiff
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
parentef3d080a9ace3f8e0c985b737ededf6d6f1285ad (diff)
Ignore failure to install files into /etc, in case install is running as non-root.
-rwxr-xr-xMakefile.PL10
-rw-r--r--debian/changelog2
-rw-r--r--doc/bugs/install_into_home_dir_fails.mdwn2
3 files changed, 10 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
}
}
diff --git a/debian/changelog b/debian/changelog
index 4595c35fb..c6fa4261c 100644
--- 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 ad19f3a69..e08b7484c 100644
--- 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>