diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-07-05 12:15:13 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-07-05 12:15:13 +0200 |
| commit | f83e252722a116803d5ea077a11fa534a54b3d31 (patch) | |
| tree | c2ac326a0bceeb871e38dc4f7ac0e95a3d1e08ee | |
| parent | 1ba6865ea14eb2f6cee1e8846887d64afd029630 (diff) | |
| download | VeraCrypt-f83e252722a116803d5ea077a11fa534a54b3d31.tar.gz VeraCrypt-f83e252722a116803d5ea077a11fa534a54b3d31.zip | |
Linux/FreeBSD: Improve build scripts for Linux/FreeBSD to have correct name for generic GUI installer
| -rwxr-xr-x | src/Main/Main.make | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index b77d4936..178c4669 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -127,20 +127,36 @@ PACKAGE_NAME := $(APPNAME)_$(TC_VERSION)_$(PLATFORM_ARCH).tar.gz endif endif +# Determine GUI/GTK conditions +GUI_CONDITION := $(filter gui,$(INSTALLER_TYPE)) +GTK2_CONDITION := $(filter 2,$(GTK_VERSION)) + 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))),1) + +ifneq (,$(GUI_CONDITION)) +ifneq (,$(GTK2_CONDITION)) 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 +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))),1) + +ifneq (,$(GUI_CONDITION)) +ifneq (,$(GTK2_CONDITION)) INSTALLER_NAME := veracrypt-$(TC_VERSION)-setup-gtk2-gui-$(CPU_ARCH) else INSTALLER_NAME := veracrypt-$(TC_VERSION)-setup-$(INSTALLER_TYPE)-$(CPU_ARCH) endif +else +INSTALLER_NAME := veracrypt-$(TC_VERSION)-setup-$(INSTALLER_TYPE)-$(CPU_ARCH) +endif + endif endif @@ -159,12 +175,21 @@ INSTALLER_TYPE := gui PACKAGE_NAME := $(APPNAME)_$(TC_VERSION)_$(SYSTEMNAME)_$(PLATFORM_ARCH).tar.gz endif +# Determine GUI/GTK conditions +GUI_CONDITION := $(filter gui,$(INSTALLER_TYPE)) +GTK2_CONDITION := $(filter 2,$(GTK_VERSION)) + INTERNAL_INSTALLER_NAME := veracrypt_install_f$(SYSTEMNAME)_$(INSTALLER_TYPE)_$(CPU_ARCH).sh -ifeq ($(and $(filter gui,$(INSTALLER_TYPE)),$(filter 2,$(GTK_VERSION))),1) + +ifneq (,$(GUI_CONDITION)) +ifneq (,$(GTK2_CONDITION)) INSTALLER_NAME := veracrypt-$(TC_VERSION)-$(SYSTEMNAME)-setup-gtk2-gui-$(CPU_ARCH) else INSTALLER_NAME := veracrypt-$(TC_VERSION)-$(SYSTEMNAME)-setup-$(INSTALLER_TYPE)-$(CPU_ARCH) endif +else +INSTALLER_NAME := veracrypt-$(TC_VERSION)-$(SYSTEMNAME)-setup-$(INSTALLER_TYPE)-$(CPU_ARCH) +endif endif #----------------------------------- |