From 9c062e58ebe88767080b813f112d653762527a82 Mon Sep 17 00:00:00 2001
From: asmeron <asmeron@ublinux.com>
Date: Wed, 9 Aug 2023 13:05:46 +0600
Subject: [PATCH] Fix makefile

---
 Makefile              | 11 +++++------
 source/CMakeLists.txt |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 21a7e9b..ad374d7 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
 
@@ -118,11 +118,10 @@ 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}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+	@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; \
@@ -145,7 +144,7 @@ help:
 	echo "... init"; \
 	echo "... debug"; \
 	echo "... prepare"; \
-	echo "... compile"; \
+	echo "... build"; \
 	echo "... install"; \
 	echo "... uninstall"; \
 	echo "... clean"
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 9ac2730..587687d 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -84,7 +84,7 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h) 
 
 set(LIBRARIES
-        ${GTK_LIBRARIES}
+        ${GTK3_LIBRARIES}
         ${GTKMM30_LIBRARIES}
         ${WEBKIT_LIBRARIES}
 #        ${VTE291_LIBRARIES}