summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-25 02:12:43 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-25 02:12:43 +0000
commitf4d99ac1ca03121255e545df89e7d841a02cc0bf (patch)
treebdabb182ecd4fb16e50d1a987de70440ec466349 /debian
parent347a756e384ec6994d4fe7ffe82e384bb9a63057 (diff)
* Use DESTDIR and not PREFIX to specify installation prefix for packaging.
* Support running "perl Makefile.PL PREFIX=foo" to build ikiwiki to run from a different directory.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/copyright2
-rwxr-xr-xdebian/rules2
3 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index cc6b286ef..0672428b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,11 @@ ikiwiki (1.22) UNRELEASED; urgency=low
* Make all pages pull in a local.css style sheet, if present. This won't
be included in ikiwiki, but can be created to make local styling changes
w/o needing to merge in every new change to the distributed style.css.
+ * Use DESTDIR and not PREFIX to specify installation prefix for packaging.
+ * Support running "perl Makefile.PL PREFIX=foo" to build ikiwiki to run
+ from a different directory.
- -- Joey Hess <joeyh@debian.org> Thu, 24 Aug 2006 16:29:24 -0400
+ -- Joey Hess <joeyh@debian.org> Thu, 24 Aug 2006 21:28:45 -0400
ikiwiki (1.21) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 1b567623d..9b3639b35 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ The smiley icons were copied from Moin Moin, which has these copyrights:
Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
Moin Moin is licensed under the terms of GPL version 2 or later.
-The basewiki and templates are licensed using a varient of the BSD license:
+The basewiki and templates are licensed using a variant of the BSD license:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/debian/rules b/debian/rules
index 48ce274db..3358db5d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ binary-indep: build
dh_testroot
dh_clean -k
$(MAKE) pure_install INSTALLDIRS=vendor \
- PREFIX=$(shell pwd)/debian/ikiwiki/$(shell perl -MConfig -e 'print $$Config{prefix}')
+ DESTDIR=$(shell pwd)/debian/ikiwiki
dh_install wikilist etc/ikiwiki
dh_installdocs html
dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL