From 9929a9e4c5baa8db4c1b1809ccfcfe2cb5ed807d Mon Sep 17 00:00:00 2001
From: asmeron <asmeron@ublinux.com>
Date: Wed, 9 Aug 2023 16:42:54 +0600
Subject: [PATCH] Reback commit 56166cb88b70d106fb950dd75918621d629a18a2

---
 Makefile | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 99c93cf..9c63112 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,6 @@ DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
 FILE_VER = source/${PKGNAME}.h
-PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
 
 default_target: all
 
@@ -24,9 +23,6 @@ init:
 	@echo "Initialize ..."; \
 	if [ -d ".git" ]; then \
 	    LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \
-	    if [ -z "$${LATEST_TAG}" ]; then \
-                LATEST_TAG="0.0"; \
-            fi; \
 	else \
 	    LATEST_TAG="Development"; \
 	fi; \
@@ -93,7 +89,7 @@ uninstall:
 	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
 	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
-	@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+	@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
@@ -118,18 +114,18 @@ install: check uninstall
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
+	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-symbolic.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-green-symbolic.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-red-symbolic.svg"
+
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-symbolic.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-green-symbolic.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-red-symbolic.svg"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
-	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
-	@install -Dm644  "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
-	@sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
@@ -152,7 +148,7 @@ help:
 	echo "... init"; \
 	echo "... debug"; \
 	echo "... prepare"; \
-	echo "... build"; \
+	echo "... compile"; \
 	echo "... install"; \
 	echo "... uninstall"; \
 	echo "... clean"
\ No newline at end of file