Merge pull request 'master' (#3) from Applications/libublsettingsui-gtk3:master into master

Reviewed-on: YanTheKaller/libublsettingsui-gtk3#3

Makefile

@@ -14,10 +14,6 @@ PKGNAME = $(MAKEFILE_DIR)
 FILE_VER = source/CMakeLists.txt
 PKGIDENT=$(subst /,-,${PREFIX})
 
-ICONS_DIR = icons/
-ICONS_DEST = /usr/share/icons/hicolor/scalable/
-ICONS := $(shell find $(ICONS_DIR) -name "*.svg")
-
 default_target: all
 
 .PHONY: all init depend debug prepare check build uninstall install clean help
@@ -97,9 +93,9 @@ uninstall:
 	        $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
 	    done; \
 	done
-	@for icon in $(ICONS); do \
-		dest=$$(echo $$icon | sed 's|$(ICONS_DIR)|$(ICONS_DEST)|g'); \
-		$(RM) $$dest; \
+	@for FILE_ICON in $(wildcard icons/*/*.svg); do \
+	    SUB_NAME=$${FILE_ICON#*/};SUB_NAME=$${FILE_ICON%/*}; \
+	    $(RM) "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \
 	done
 	@$(RM) "${DESTDIR}${PREFIX}/lib/${PKGNAME}".so*
 	@$(RM) "${DESTDIR}${PREFIX}/include/${PKGNAME}".h*
@@ -127,9 +123,9 @@ install: check
 		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
 	done
 	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@for icon in $(ICONS); do \
-		dest=$$(echo $$icon | sed 's|$(ICONS_DIR)|$(ICONS_DEST)|g'|cut -d'/' -f1-7); \
-		install -Dm644 -t $$dest/ $$icon; \
+	@for FILE_ICON in $(wildcard icons/*/*.svg); do \
+	    SUB_NAME=$${FILE_ICON#*/};SUB_NAME=$${FILE_ICON%/*}; \
+	    install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \
 	done
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \