[repo] add trailing slash to DESTDIR if not specified

CE-Programming · Nov 12, 2024 · 93c7d56 · 93c7d56
1 parent e53d880
commit 93c7d56
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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))