install: work around historical BSD cp(1) behavior
Strip ending / (slash) of the source when copying hicolor directory to avoid installing icons under a theme with empty name. This should unbreak expanding Icon in .desktop file by gtk_icon_theme_lookup_icon() on DragonFly and FreeBSD. |cp -R foo/ bar| == |cp -R foo/. bar| was disabled by NetBSD and OpenBSD years ago to match POSIX. Other cp(1) implementations aren't affected.
This commit is contained in:
2
Makefile
2
Makefile
@@ -391,7 +391,7 @@ install-tools: tools
|
||||
|
||||
install-linux-icons:
|
||||
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
|
||||
@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
|
||||
@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"
|
||||
|
||||
install-linux-desktop:
|
||||
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
|
||||
|
||||
Reference in New Issue
Block a user