From cb3d4f02ec5be04acbc4d39e762105a9f8b7bd77 Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Mon, 17 Jul 2023 18:06:01 +0600
Subject: [PATCH] Fix makefile

---
 Makefile                          | 17 +++++++----------
 source/ubl-settings-repomanager.h |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index fde6868..e705317 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,9 @@ CMAKE_COMMAND = cmake
 CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
 CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
 DEPENDS = /bin/cmake
-PREFIX ?= /usr
+PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
+FILE_VER = source/${PKGNAME}.h
 
 default_target: all
 
@@ -21,11 +22,11 @@ all: init build
 init:
 	@echo "Initialize ..."; \
 	if [ -d ".git" ]; then \
-	    LATEST_TAG=$$(git describe --tags | sed 's/^v//'); \
+	    LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \
 	else \
-	    LATEST_TAG="0.0"; \
+	    LATEST_TAG="Development"; \
 	fi; \
-	sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
+	sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
 
 depend:
@@ -64,7 +65,8 @@ check:
 
 build: depend prepare
 	@echo "Build ..."; \
-	make --directory=${CMAKE_BUILD_DIR}; \
+	$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
+	sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
 	echo "Build: OK"
 
 uninstall:
@@ -113,17 +115,12 @@ install: check uninstall
 		install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
 		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 -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
-	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
-	@install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"
-	@install -dm755 -d "${DESTDIR}${PREFIX}/share/${PKGNAME}/images"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png"
 	@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"
diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h
index fe3a1bd..ddf5c4a 100644
--- a/source/ubl-settings-repomanager.h
+++ b/source/ubl-settings-repomanager.h
@@ -25,7 +25,7 @@
 #define LocalePath "/usr/share/locale" 
 #define LocaleName "ubl-settings-repomanager"
 typedef char* string;
-string version_application = "1.0";
+string version_application;
 
 char *local;