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

master
Joey Hess 2008-08-29 15:53:46 -04:00
parent ef3d080a9a
commit 981d0474a1
3 changed files with 10 additions and 4 deletions

View File

@ -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
}
}

2
debian/changelog vendored
View File

@ -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

View File

@ -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>