From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 22 Aug 2008 03:12:14 +0000 (-0400)
Subject: Revert "Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)"
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/15ed67132ee70a3c9c98565dee464a8f968c765c

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

This reverts commit 65c12dffecc49df2d8135a32121b9cabe8288cae.

Turns out we can't use PREFIX for files in /etc, because that would tend to
put them in /usr/etc, which is bad..
---

diff --git a/Makefile.PL b/Makefile.PL
index b0d56ee82..fa0b8ba49 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -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 \
diff --git a/debian/changelog b/debian/changelog
index 813cf9523..6f19153e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.