diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index b41087ca6..c427791c3 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -133,7 +133,7 @@ jobs: - name: Install Toolchain env: PREFIX: ${{github.workspace}} - run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}/ + run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}} - name: Make Binaries Executable if: runner.os != 'Windows' diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 8006a5426..f270f7631 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -136,7 +136,7 @@ jobs: - name: Install Toolchain env: PREFIX: ${{github.workspace}} - run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}/ + run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}} - name: Make Binaries Executable if: runner.os != 'Windows' diff --git a/src/common.mk b/src/common.mk index eb78647fb..886e9b25b 100644 --- a/src/common.mk +++ b/src/common.mk @@ -75,7 +75,7 @@ RELEASE_NAME = linux endif endif -INSTALL_DIR := $(DESTDIR)$(PREFIX) +INSTALL_DIR := $(patsubst %/,%,$(DESTDIR))/$(PREFIX) INSTALL_PATH := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR))) INSTALL_EXAMPLES := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/examples)) INSTALL_LIB := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/lib/libload))