From: martin f. krafft <madduck@debian.org>
Date: Tue, 12 Aug 2008 17:34:25 +0000 (-0300)
Subject: Merge commit 'refs/top-bases/debian/locations' into debian/locations
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5a4688543ef23f27f0c97cee3ac4d28f69232ad9;p=topgit.git

Merge commit 'refs/top-bases/debian/locations' into debian/locations

Conflicts:

	Makefile
---

5a4688543ef23f27f0c97cee3ac4d28f69232ad9
diff --cc Makefile
index 9b826c8,bafec26..07b549b
--- a/Makefile
+++ b/Makefile
@@@ -31,14 -31,14 +31,14 @@@ $(help_out): READM
  	./create-help.sh $$CMD
  
  install:: all
- 	install -d -m 755 "$(bindir)"
- 	install tg "$(bindir)"
- 	install -d -m 755 "$(cmddir)"
- 	install $(commands_out) "$(cmddir)"
- 	install -d -m 755 "$(hooksdir)"
- 	install $(hooks_out) "$(hooksdir)"
- 	install -d -m 755 "$(docdir)"
- 	install -m 644 $(help_out) "$(docdir)"
+ 	install -d -m 755 "$(DESTDIR)$(bindir)"
+ 	install tg "$(DESTDIR)$(bindir)"
+ 	install -d -m 755 "$(DESTDIR)$(cmddir)"
+ 	install $(commands_out) "$(DESTDIR)$(cmddir)"
+ 	install -d -m 755 "$(DESTDIR)$(hooksdir)"
+ 	install $(hooks_out) "$(DESTDIR)$(hooksdir)"
 -	install -d -m 755 "$(DESTDIR)$(sharedir)"
 -	install -m 644 $(help_out) "$(DESTDIR)$(sharedir)"
++	install -d -m 755 "$(DESTDIR)$(docdir)"
++	install -m 644 $(help_out) "$(DESTDIR)$(docdir)"
  
  clean::
  	rm -f tg $(commands_out) $(hooks_out) $(help_out)