From 882e45f2febb4a84646330687e34a394ecae4afb Mon Sep 17 00:00:00 2001
From: asmeron <asmeron@ublinux.com>
Date: Wed, 9 Aug 2023 14:31:21 +0600
Subject: [PATCH] Fix makefile

---
 Makefile                        | 20 ++++++++------------
 source/ubl-settings-diskquota.h |  0
 2 files changed, 8 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 source/ubl-settings-diskquota.h

diff --git a/Makefile b/Makefile
index f309614..3dc725e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
 FILE_VER = source/${PKGNAME}.h
-PKGIDENT=$(subst /,-,${PREFIX})
+PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
 
 default_target: all
 
@@ -24,10 +24,8 @@ 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"; \
-			echo "$${LATEST_TAG} is empty"; \
+		if [ -z "$${LATEST_TAG}" ]; then \
+			LATEST_TAG="0.0"; \
 		fi; \
 	else \
 	    LATEST_TAG="Development"; \
@@ -118,15 +116,13 @@ install: check uninstall
 		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}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy
-	@sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i
-	@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}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg"
-	@ldconfig -n /usr/local/lib
+	@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; \
@@ -149,7 +145,7 @@ help:
 	echo "... init"; \
 	echo "... debug"; \
 	echo "... prepare"; \
-	echo "... compile"; \
+	echo "... build"; \
 	echo "... install"; \
 	echo "... uninstall"; \
 	echo "... clean"
\ No newline at end of file
diff --git a/source/ubl-settings-diskquota.h b/source/ubl-settings-diskquota.h
old mode 100755
new mode 100644