Skip to content

Commit 7d520e5

Browse files
author
Leo Pham
committed
Simplify and clean up Makefile
Don't explicitly specify permissions, since they're already the defaults. Use `-D` flag to create missing directories instead of creating beforehand. Force remove in uninstall instead of testing existence to avoid race condition. Remove unnecessary Make variable. Quote paths for safety in case of whitespace.
1 parent 5d261be commit 7d520e5

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

Makefile

+5-8
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ ifeq ($(PREFIX),)
22
PREFIX := /usr/local
33
endif
44

5-
pkgdatadir = $(PREFIX)/share/mantabassets
65
.PHONY: install
76
install:
8-
sed "s|@pkgdatadir[@]|$(pkgdatadir)|g" mantablockscreen.in > mantablockscreen
9-
install -d $(DESTDIR)$(PREFIX)/bin
10-
install -d $(DESTDIR)$(PREFIX)/share/mantabassets
11-
install -m 755 mantablockscreen $(DESTDIR)$(PREFIX)/bin/mantablockscreen
12-
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/'
1310

1411
.PHONY: uninstall
1512
uninstall:
16-
test -e $(DESTDIR)$(PREFIX)/bin/mantablockscreen && rm $(DESTDIR)$(PREFIX)/bin/mantablockscreen
17-
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'

0 commit comments

Comments
 (0)