From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 22 Aug 2008 02:25:36 +0000 (-0400)
Subject: Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)
X-Git-Tag: 2.62~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65c12dffecc49df2d8135a32121b9cabe8288cae;p=ikiwiki.git

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

diff --git a/Makefile.PL b/Makefile.PL
index fa0b8ba49..b0d56ee82 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -48,9 +48,9 @@ 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)/etc/ikiwiki
+	install -m 0644 wikilist $(DESTDIR)$(PREFIX)/etc/ikiwiki
+	install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/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 d7ea6c1af..e8dfdb7f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (2.62) UNRELEASED; urgency=low
 
   * Avoid using cp -a (again). (HenrikBrixAndersen)
+  * Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)
 
  -- Joey Hess <joeyh@debian.org>  Thu, 21 Aug 2008 16:20:58 -0400