Skip to content

Commit 93c7d56

Browse files
[repo] add trailing slash to DESTDIR if not specified
1 parent e53d880 commit 93c7d56

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
- name: Install Toolchain
134134
env:
135135
PREFIX: ${{github.workspace}}
136-
run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}/
136+
run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}
137137

138138
- name: Make Binaries Executable
139139
if: runner.os != 'Windows'

.github/workflows/make.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
- name: Install Toolchain
137137
env:
138138
PREFIX: ${{github.workspace}}
139-
run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}/
139+
run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}
140140

141141
- name: Make Binaries Executable
142142
if: runner.os != 'Windows'

src/common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ RELEASE_NAME = linux
7575
endif
7676
endif
7777

78-
INSTALL_DIR := $(DESTDIR)$(PREFIX)
78+
INSTALL_DIR := $(patsubst %/,%,$(DESTDIR))/$(PREFIX)
7979
INSTALL_PATH := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)))
8080
INSTALL_EXAMPLES := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/examples))
8181
INSTALL_LIB := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/lib/libload))

0 commit comments

Comments
 (0)