1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From: martin f. krafft <[email protected]>
Subject: [PATCH] make file locations Debian-compatible
Signed-off-by: martin f. krafft <[email protected]>
---
Makefile | 10 -----
tg.sh | 4 --
2 files changed, 7 insertions( ), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 3ce39a5..31cc98e 100644
--- 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' \
[email protected] >$@ && \
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 1f259e3..a27d5ce 100644
--- 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
--
tg: (48dfe38..) debian/locations (depends on: master)
|
