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

Conflicts:
	Makefile
	tg.sh

diff --cc Makefile
index 07b549b40cc6e4f106ade5fb6c4edeba32fa7ef1,b73a1f15b9c298e0e922df1c61f6fb15df8f7821..2777e1619515e24b35b49ad1aa01a5cf5f0ee254
--- 1/Makefile
--- 2/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 2339675cac6b467f1ee622a962dc927aa9d36f2b,b4933997e9a6fb484554257b4e2cf31c2dca924c..dcc08677939eb6b88da93c1291a4e80aa103e0d4
--- 1/tg.sh
--- 2/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