From 5483384e4457d12b62f7d66fbaff7c5dcd7cacb9 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 7 Jun 2015 13:52:14 +0000 Subject: [PATCH] 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. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 79b973e517..f0cc1ba251 100644 --- a/Makefile +++ b/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"