From 209c97c4664b95fdfcf0a20691cec36f5e574b08 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 19 Jan 2026 14:33:27 +0900
Subject: Remove VERSION_BRANCH and SS_DIRTAG

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 admin/acinclude.m4.in          | 33 +++++++++++++++------------------
 config.h.in                    |  3 ---
 src/kvilib/config/kvi_wincfg.h |  2 --
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 3c91617..002f2f2 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2178,9 +2178,6 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
 		fi
 	done
 	
-	SS_DIRTAG=`echo $VERSION | cut -d . -f 1,2`
-	
-	AC_DEFINE_UNQUOTED([VERSION_BRANCH], "$SS_DIRTAG", [MAJOR.MINOR part of version])
 	AC_DEFINE_UNQUOTED([BUILD_FLAGS],"$target_cpu-$build_flags", [these are the build flags])
 
 	globalkvircdir="\${datadir}/apps/kvirc"
@@ -2224,7 +2221,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
 	if test -n "$SS_KDE_SERVICESDIR"; then
 		kdeservicesdir="$SS_KDE_SERVICESDIR"
 	else
-		kdeservicesdir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/protocols"
+		kdeservicesdir="\${exec_prefix}/share/kvirc/protocols"
 	fi
 	AC_SUBST(kdeservicesdir)
 
@@ -2244,20 +2241,20 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
 		xdg_apps="$SS_KDE_GENERAL_DIR/share/applications/tde"
 		mimelnkdir="$SS_KDE_GENERAL_DIR/share/mimelnk/text"
 	else
-		iconapps16datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/16x16"
-		iconapps32datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/32x32"
-		iconapps48datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/48x48"
-		iconapps64datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/64x64"
-		iconapps128datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/128x128"
-		iconappsscalabledatadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/scalable"
-		iconmime16datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/16x16"
-		iconmime32datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/32x32"
-		iconmime48datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/48x48"
-		iconmime64datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/64x64"
-		iconmime128datadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/128x128"
-		iconmimescalabledatadir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/icons/scalable"
-		xdg_apps="\${exec_prefix}/share/kvirc/$SS_DIRTAG/applications"
-		mimelnkdir="\${exec_prefix}/share/kvirc/$SS_DIRTAG/mimelnk"
+		iconapps16datadir="\${exec_prefix}/share/kvirc/icons/16x16"
+		iconapps32datadir="\${exec_prefix}/share/kvirc/icons/32x32"
+		iconapps48datadir="\${exec_prefix}/share/kvirc/icons/48x48"
+		iconapps64datadir="\${exec_prefix}/share/kvirc/icons/64x64"
+		iconapps128datadir="\${exec_prefix}/share/kvirc/icons/128x128"
+		iconappsscalabledatadir="\${exec_prefix}/share/kvirc/icons/scalable"
+		iconmime16datadir="\${exec_prefix}/share/kvirc/icons/16x16"
+		iconmime32datadir="\${exec_prefix}/share/kvirc/icons/32x32"
+		iconmime48datadir="\${exec_prefix}/share/kvirc/icons/48x48"
+		iconmime64datadir="\${exec_prefix}/share/kvirc/icons/64x64"
+		iconmime128datadir="\${exec_prefix}/share/kvirc/icons/128x128"
+		iconmimescalabledatadir="\${exec_prefix}/share/kvirc/icons/scalable"
+		xdg_apps="\${exec_prefix}/share/kvirc/applications"
+		mimelnkdir="\${exec_prefix}/share/kvirc/mimelnk"
 	fi
 	AC_SUBST(iconapps16datadir)
 	AC_SUBST(iconapps32datadir)
diff --git a/config.h.in b/config.h.in
index 6cdab96..d84ed42 100644
--- a/config.h.in
+++ b/config.h.in
@@ -236,9 +236,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* MAJOR.MINOR part of version */
-#undef VERSION_BRANCH
-
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h
index 56fa5fa..b552cd1 100644
--- a/src/kvilib/config/kvi_wincfg.h
+++ b/src/kvilib/config/kvi_wincfg.h
@@ -142,8 +142,6 @@
 /* Version number of package */
 #define VERSION "3.4.0"
 
-#define VERSION_BRANCH "3.4"
-
 
 /* Define if the system does not provide POSIX.1 features except with this
    defined. */
-- 
cgit v1.2.3