From 711d4c075efc0656025116f5a7933e5ae8d6d651 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 28 Sep 2006 23:11:24 +0000 Subject: [PATCH] =?UTF-8?q?*=20Patch=20from=20Paul=20T=C3=B6tterman=20to?= =?UTF-8?q?=20use=20CP=20in=20the=20Makefile.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile.PL | 4 ++-- debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index ead7f5dc5..1acb4bcf7 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -32,10 +32,10 @@ extra_clean: extra_install: install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates - cp templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates + $(CP) templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki - cp -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki + $(CP) -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki install -d $(DESTDIR)$(PREFIX)/share/man/man1 install ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1 diff --git a/debian/changelog b/debian/changelog index fd48a6135..a6c7821f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (1.29) UNRELEASED; urgency=low + + * Patch from Paul Tötterman to use CP in the Makefile. + + -- Joey Hess Thu, 28 Sep 2006 19:10:58 -0400 + ikiwiki (1.28) unstable; urgency=low * inline: Add ability to sort by page name, based on a patch from