Revert "Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)"

This reverts commit 65c12dffec.

Turns out we can't use PREFIX for files in /etc, because that would tend to
put them in /usr/etc, which is bad..
master
Joey Hess 2008-08-21 23:12:14 -04:00
parent 00a4271290
commit 15ed67132e
2 changed files with 3 additions and 4 deletions

View File

@ -48,9 +48,9 @@ extra_clean:
$(MAKE) -C po clean
extra_install:
install -d $(DESTDIR)$(PREFIX)/etc/ikiwiki
install -m 0644 wikilist $(DESTDIR)$(PREFIX)/etc/ikiwiki
install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/etc/ikiwiki
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 \

1
debian/changelog vendored
View File

@ -1,7 +1,6 @@
ikiwiki (2.62) UNRELEASED; urgency=low
* Avoid using cp -a (again). (HenrikBrixAndersen)
* Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)
* Avoid using hostname -f for portability to eg, OS X, use Net::Domain
instead, and prompt if it fails.