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

diff --git a/Makefile.PL b/Makefile.PL
index fa0b8ba49dd7ca320028179b86300f604318de30..b0d56ee8234dad6b3645c158e4c0b65b59c80483 100755 (executable)
--- 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 d7ea6c1afac5de2e72828e96f28def525e394799..e8dfdb7f6cf0edf69f9fdddb8eaa334e272b7578 100644 (file)
--- 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