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

Conflicts:

	tg.sh

diff --git a/.topdeps b/.topdeps
index 045951300cf4890e4273f294da20894d587b9ad1..1f7391f92b6a3792204e07e99f71f643cc35e7e1 100644 (file)
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-upstream
+master

diff --git a/.topmsg b/.topmsg
index 337e37f98d54141d0d6d91b11090973b0f8b04ca..7db14ee2452b4cbcb16c90a6cda8dad1b2106004 100644 (file)
--- a/.topmsg
+++ b/.topmsg
@@ -1,7 +1,4 @@
 From: martin f. krafft <madduck@debian.org>
-Subject: [PATCH] add DESTDIR support to Makefile
-
-This is needed for distros to be able to install files to a temporary root
-location, without affecting the PREFIX paths that are used at runtime.
+Subject: [PATCH] make file locations Debian-compatible
 
 Signed-off-by: martin f. krafft <madduck@debian.org>

diff --git a/Makefile b/Makefile
index 2c627afbaab085c72f58257399edca8da4d77fb5..835811ed048c967185b227b68a77fee422925f08 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 prefix = $(HOME)
 bindir = $(prefix)/bin
-cmddir = $(prefix)/libexec/topgit
-sharedir = $(prefix)/share/topgit
+cmddir = $(prefix)/share/topgit
+docdir = $(prefix)/share/doc/topgit
 hooksdir = $(cmddir)/hooks
 
 
@@ -19,7 +19,7 @@ tg $(commands_out) $(hooks_out): % : %.sh Makefile
        @sed -e 's#@cmddir@#$(cmddir)#g;' \
                -e 's#@hooksdir@#$(hooksdir)#g' \
                -e 's#@bindir@#$(bindir)#g' \
-               -e 's#@sharedir@#$(sharedir)#g' \
+               -e 's#@docdir@#$(docdir)#g' \
                $@.sh >$@+ && \
        chmod +x $@+ && \
        mv $@+ $@
@@ -36,8 +36,8 @@ install:: all
        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)

diff --git a/tg.sh b/tg.sh
index 7005f98c882bde7c97094862aeb88b07b28de390..ecc65748141dd53a224f382f7d53ddcacb2ba65d 100644 (file)
--- a/tg.sh
+++ b/tg.sh
@@ -227,8 +227,8 @@ do_help()
        elif [ -r "@cmddir@"/tg-$1 ] ; then
                @cmddir@/tg-$1 -h || :
                echo
-               if [ -r "@sharedir@/tg-$1.txt" ] ; then
-                       cat "@sharedir@/tg-$1.txt"
+               if [ -r "@docdir@/tg-$1.txt" ] ; then
+                       cat "@docdir@/tg-$1.txt"
                fi
        else
                echo "`basename $0`: no help for $1" 1>&2