From: martin f. krafft <madduck@debian.org>
Date: Wed, 10 Sep 2008 08:36:34 +0000 (+0100)
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=0cbd6990ae81d73fdec784f4bd8e7b8e42d16e97;p=topgit.git

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

Conflicts:
	Makefile
	tg.sh
---

0cbd6990ae81d73fdec784f4bd8e7b8e42d16e97
diff --cc Makefile
index 07b549b,b73a1f1..2777e16
--- a/Makefile
+++ b/Makefile
@@@ -1,8 -1,7 +1,7 @@@
- # Set PREFIX to wherever you want to install TopGit
- PREFIX = $(HOME)
- bindir = $(PREFIX)/bin
- cmddir = $(PREFIX)/share/topgit
- docdir = $(PREFIX)/share/doc/topgit
+ prefix = $(HOME)
+ bindir = $(prefix)/bin
+ cmddir = $(prefix)/libexec/topgit
 -sharedir = $(prefix)/share/topgit
++docdir = $(prefix)/share/doc/topgit
  hooksdir = $(cmddir)/hooks
  
  
diff --cc tg.sh
index 2339675,b493399..dcc0867
--- a/tg.sh
+++ b/tg.sh
@@@ -195,10 -222,10 +222,10 @@@ do_help(
  			sep="|"
  		done
  
- 		echo "TopGit v0.2 - A different patch queue manager"
- 		echo "Usage: tg ($cmds|help) ..."
- 	elif [ -r "@docdir@/tg-$1.txt" ] ; then
- 		cat "@docdir@/tg-$1.txt"
+ 		echo "TopGit v0.3 - A different patch queue manager"
+ 		echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
 -	elif [ -r "@sharedir@/tg-$1.txt" ] ; then
 -		cat "@sharedir@/tg-$1.txt"
++        elif [ -r "@docdir@/tg-$1.txt" ] ; then
++                cat "@docdir@/tg-$1.txt"
  	else
  		echo "`basename $0`: no help for $1" 1>&2
  	fi