aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-11 17:29:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-11 17:29:50 -0400
commit10484a69b8a7617fea5ce7ba95e31fe1a9eff7b4 (patch)
tree2b948b4a5e7f6bb66bba5ac885e0dc543869cb41
parent77e52a52dd2f77e5acc0643673169b4e1d2550f9 (diff)
Makefile: Add PREFIX variable.
-rw-r--r--Makefile15
-rw-r--r--debian/changelog1
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ad143e7b6..b5f5a720b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
-all: git-annex docs
+PREFIX=/usr
+GHCMAKE=ghc -Wall -odir build -hidir build -O2 --make
-ghcmake=ghc -Wall -odir build -hidir build -O2 --make
+all: git-annex docs
SysConfig.hs: configure.hs
- $(ghcmake) configure
+ $(GHCMAKE) configure
./configure
git-annex: SysConfig.hs
- $(ghcmake) git-annex
+ $(GHCMAKE) git-annex
install:
- install -d $(DESTDIR)/usr/bin
- install git-annex $(DESTDIR)/usr/bin
+ install -d $(DESTDIR)$(PREFIX)/bin
+ install git-annex $(DESTDIR)$(PREFIX)/bin
# If ikiwiki is available, build static html docs suitable for being
# shipped in the software package.
@@ -22,7 +23,7 @@ IKIWIKI=ikiwiki
endif
test:
- $(ghcmake) test
+ $(GHCMAKE) test
./test
docs:
diff --git a/debian/changelog b/debian/changelog
index 6bc3c788a..fe15dfdf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ git-annex (0.12) UNRELEASED; urgency=low
* Add --exclude option to exclude files from processing.
* mwdn2man: Fix a bug in newline supression. Closes: #606578
* Bugfix to git annex add of an unlocked file in a subdir. Closes: #606579
+ * Makefile: Add PREFIX variable.
-- Joey Hess <joeyh@debian.org> Wed, 08 Dec 2010 14:06:47 -0400