aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-21 22:25:36 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-21 22:25:36 -0400
commit65c12dffecc49df2d8135a32121b9cabe8288cae (patch)
treeeee8e293d70ad39f1bd3377bcbea31bf1f485150
parent8ae1aa3dfaf865fc12d71afcc8676972f2b1ac47 (diff)
downloadikiwiki-65c12dffecc49df2d8135a32121b9cabe8288cae.tar
ikiwiki-65c12dffecc49df2d8135a32121b9cabe8288cae.tar.gz
Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)
-rwxr-xr-xMakefile.PL6
-rw-r--r--debian/changelog1
2 files changed, 4 insertions, 3 deletions
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