Skip to content

Commit 09f74d4

Browse files
authored
Merge pull request #6 from ForgottenUmbrella/proper-prefix
Keep installation fully within /usr/local by default
2 parents f4f37d9 + 7d520e5 commit 09f74d4

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

Makefile

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
ifeq ($(PREFIX),)
2-
PREFIX := /usr
2+
PREFIX := /usr/local
33
endif
44

55
.PHONY: install
66
install:
7-
install -d $(DESTDIR)$(PREFIX)/local/bin
8-
install -d $(DESTDIR)$(PREFIX)/share/mantabassets
9-
install -m 755 mantablockscreen $(DESTDIR)$(PREFIX)/local/bin/mantablockscreen
10-
install -m 755 mantabassets/* $(DESTDIR)$(PREFIX)/share/mantabassets/
7+
sed 's|@pkgdatadir[@]|$(PREFIX)/share/mantabassets|g' mantablockscreen.in > mantablockscreen
8+
install -D mantablockscreen '$(DESTDIR)$(PREFIX)/bin/mantablockscreen'
9+
install -D mantabassets/* -t '$(DESTDIR)$(PREFIX)/share/mantabassets/'
1110

1211
.PHONY: uninstall
1312
uninstall:
14-
test -e $(DESTDIR)$(PREFIX)/local/bin/mantablockscreen && rm $(DESTDIR)$(PREFIX)/local/bin/mantablockscreen
15-
test -d $(DESTDIR)$(PREFIX)/share/mantabassets && rm -rf $(DESTDIR)$(PREFIX)/share/mantabassets || exit 0
13+
rm -f '$(DESTDIR)$(PREFIX)/bin/mantablockscreen'
14+
rm -rf '$(DESTDIR)$(PREFIX)/share/mantabassets'

mantablockscreen renamed to mantablockscreen.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ verif_color=fefefe66
2424
cropuser() {
2525
ava_home=$HOME/.face
2626
ava_var=/var/lib/AccountsService/icons/$USER
27-
userpic=/usr/share/mantabassets/userpic.png
27+
userpic=@pkgdatadir@/userpic.png
2828
if [[ -e $ava_home ]]; then
2929
userpic=$ava_home
3030
elif [[ -e $ava_var ]]; then
@@ -139,7 +139,7 @@ circleclock() {
139139
}
140140

141141
show_help(){
142-
cat <<-EOF
142+
cat <<-EOF
143143
Usage :
144144
mantablockscreen [OPTION]
145145
@@ -152,8 +152,8 @@ show_help(){
152152
EOF
153153
}
154154

155-
case $1 in
156-
-i|--image)
155+
case $1 in
156+
-i|--image)
157157
genbg $2 ;;
158158
-h|--help)
159159
show_help ;;

0 commit comments

Comments
 (0)