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

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 3ce39a5633f4a7bab6b3835f6169d1b23e78cefd..31cc98e6fecdc1cec803f8c5744eb9b324d5b4b0 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 1f259e3a03d60dad30bac2a34253cd9a78a1d7ca..a27d5ce60ca86426fe1a76b4bbed10fa856aa34a 100644 (file)
--- a/tg.sh
+++ b/tg.sh
@@ -272,8 +272,8 @@ do_help()
                setup_pager
                @cmddir@/tg-$1 -h 2>&1 || :
                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