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 b0d56ee8234dad6b3645c158e4c0b65b59c80483..fa0b8ba49dd7ca320028179b86300f604318de30 100755 (executable)
--- 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 813cf95237beb31bf7850ba889ea9c20779e4564..6f19153e0f43c17a5cd526b8d238c15f107e8116 100644 (file)
--- 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.