From 31898a38d49def480a086afd43fd918546b1989b Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 26 Jun 2024 02:23:57 +0200 Subject: Linux/FreeBSD: use GTK3 flavor for default generic gui installer. create GTK2 specific gui installer. --- src/Main/Main.make | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Main/Main.make b/src/Main/Main.make index a1c3519a..ee73cbf9 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -129,11 +129,19 @@ endif ifeq "$(origin NOSSE2)" "command line" INTERNAL_INSTALLER_NAME := veracrypt_install_$(INSTALLER_TYPE)_$(CPU_ARCH)_legacy.sh +ifeq "$(and $(filter gui,$(INSTALLER_TYPE)),$(filter 2,$(GTK_VERSION)))" +INSTALLER_NAME := veracrypt-$(TC_VERSION)-setup-gtk2-gui-$(CPU_ARCH)-legacy +else INSTALLER_NAME := veracrypt-$(TC_VERSION)-setup-$(INSTALLER_TYPE)-$(CPU_ARCH)-legacy +endif else INTERNAL_INSTALLER_NAME := veracrypt_install_$(INSTALLER_TYPE)_$(CPU_ARCH).sh +ifeq "$(and $(filter gui,$(INSTALLER_TYPE)),$(filter 2,$(GTK_VERSION)))" +INSTALLER_NAME := veracrypt-$(TC_VERSION)-setup-gtk2-gui-$(CPU_ARCH) +else INSTALLER_NAME := veracrypt-$(TC_VERSION)-setup-$(INSTALLER_TYPE)-$(CPU_ARCH) endif +endif endif #----------------------------------- @@ -152,7 +160,11 @@ PACKAGE_NAME := $(APPNAME)_$(TC_VERSION)_$(SYSTEMNAME)_$(PLATFORM_ARCH).tar.gz endif INTERNAL_INSTALLER_NAME := veracrypt_install_f$(SYSTEMNAME)_$(INSTALLER_TYPE)_$(CPU_ARCH).sh +ifeq "$(and $(filter gui,$(INSTALLER_TYPE)),$(filter 2,$(GTK_VERSION)))" +INSTALLER_NAME := veracrypt-$(TC_VERSION)-$(SYSTEMNAME)-setup-gtk2-gui-$(CPU_ARCH) +else INSTALLER_NAME := veracrypt-$(TC_VERSION)-$(SYSTEMNAME)-setup-$(INSTALLER_TYPE)-$(CPU_ARCH) +endif endif #----------------------------------- -- cgit v1.2.3