sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename icon & desktop and add install-all in Makefile (#96) 

* Rename in Makefile

Renamed {icon,desktop} => install-{icon,desktop}

* Add install-all in Makefile

* Added .PHONY targets and renamed icon_cleanup

Added .PHONY targets and renamed icon_cleanup to uninstall_icon

* Update README.md

Co-authored-by: TAAPArthur <taaparthur@gmail.com>
This commit is contained in:
Berke Kocaoğlu 2021-09-25 08:00:21 +03:00 committed by GitHub
parent 4ec8fd5377
commit 696f68753f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -46,7 +46,7 @@ LDLIBS = -lImlib2 -lX11 -lXft -lfontconfig $(OPTIONAL_LIBS)
OBJS = autoreload_$(AUTORELOAD).o commands.o image.o main.o options.o \ OBJS = autoreload_$(AUTORELOAD).o commands.o image.o main.o options.o \
thumbs.o util.o window.o thumbs.o util.o window.o
.PHONY: all clean install uninstall icon .PHONY: all clean install uninstall install-all install-icon uninstall-icon install-desktop
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .SUFFIXES: .c .o
@ -87,12 +87,14 @@ version.h: Makefile .git/index
clean: clean:
$(RM) *.o nsxiv $(RM) *.o nsxiv
desktop: install-all: install install-desktop install-icon
install-desktop:
@echo "INSTALL nsxiv.desktop" @echo "INSTALL nsxiv.desktop"
mkdir -p $(DESTDIR)$(PREFIX)/share/applications mkdir -p $(DESTDIR)$(PREFIX)/share/applications
cp nsxiv.desktop $(DESTDIR)$(PREFIX)/share/applications cp nsxiv.desktop $(DESTDIR)$(PREFIX)/share/applications
icon: install-icon:
@echo "INSTALL icon" @echo "INSTALL icon"
for f in $(ICONS); do \ for f in $(ICONS); do \
dir="$(DESTDIR)$(PREFIX)/share/icons/hicolor/$${f%.png}/apps"; \ dir="$(DESTDIR)$(PREFIX)/share/icons/hicolor/$${f%.png}/apps"; \
@ -101,7 +103,7 @@ icon:
chmod 644 "$$dir/nsxiv.png"; \ chmod 644 "$$dir/nsxiv.png"; \
done done
icon_cleanup: uninstall-icon:
@echo "REMOVE icon" @echo "REMOVE icon"
for f in $(ICONS); do \ for f in $(ICONS); do \
dir="$(DESTDIR)$(PREFIX)/share/icons/hicolor/$${f%.png}/apps"; \ dir="$(DESTDIR)$(PREFIX)/share/icons/hicolor/$${f%.png}/apps"; \
@ -119,7 +121,7 @@ install: all
@echo "INSTALL share/nsxiv/" @echo "INSTALL share/nsxiv/"
install -Dt $(DESTDIR)$(DOCPREFIX)/examples examples/* install -Dt $(DESTDIR)$(DOCPREFIX)/examples examples/*
uninstall: icon_cleanup uninstall: uninstall-icon
@echo "REMOVE bin/nsxiv" @echo "REMOVE bin/nsxiv"
rm -f $(DESTDIR)$(PREFIX)/bin/nsxiv rm -f $(DESTDIR)$(PREFIX)/bin/nsxiv
@echo "REMOVE nsxiv.1" @echo "REMOVE nsxiv.1"

8
README.md
View File

@ -82,11 +82,15 @@ Installing nsxiv:
Installing desktop entry: Installing desktop entry:
# make desktop # make install-desktop
Installing icons: Installing icons:
# make icon # make install-icon
Installing all of the above:
# make install-all
Please note, that these requires root privileges. Please note, that these requires root privileges.
By default, nsxiv is installed using the prefix `/usr/local`, so the full path By default, nsxiv is installed using the prefix `/usr/local`, so the full path