diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-06-13 13:04:56 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-06-19 20:00:39 +0200 |
| commit | e56a8300d36a7998e492e87bc514d14d931cf01d (patch) | |
| tree | 2c2b24a29854166103f5d6300b1a75d0e019973f /Makefile.gbuild | |
| parent | d8ddd3f1c9faa3338703217967bae5c363df0e45 (diff) | |
use gb_StaticLibrary_WORKDIR and gb_Library_DLLDIR more consistently
same for gb_Executable_BINDIR[_FOR_BUILD] and fold
gb_Library_WORKDIR_FOR_BUILD into gb_Library_DLLDIR_FOR_BUILD (the
latter also has a workdir variant)
Change-Id: If7e4cf9aab46728182c89344546065bc33b452b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169201
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'Makefile.gbuild')
| -rw-r--r-- | Makefile.gbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild index bad2fc9f7f15..1e0e97e6e611 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -56,7 +56,7 @@ create-partial-info: BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H$(if create-partial-info: MAR_NAME_PREFIX = $(PRODUCTNAME)_$(VERSION_FULL)_$(PLATFORM)_$(BUILDID) create-partial-info: ONLINEUPDATE_MAR_OLDMSI = $(MSIDIR)$(PRODUCTNAME)_$(OLD_VER)_Win_$(subst AARCH64,aarch64,$(subst X86_64,x86-64,$(ARCH))).msi create-partial-info: ONLINEUPDATE_MAR_NEWMSI = $(MSIDIR)$(PRODUCTNAME)_$(VERSION)_Win_$(subst AARCH64,aarch64,$(subst X86_64,x86-64,$(ARCH))).msi -create-partial-info: export MBSDIFF := $(WORKDIR)/LinkTarget/Executable/mbsdiff +create-partial-info: export MBSDIFF := $(gb_Executable_BINDIR)/mbsdiff create-partial-info: export MAR := $(INSTDIR)/program/mar create-partial-info: create-partial-info-AARCH64 create-partial-info-X86_64 create-partial-info-x86 |