diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 84eb900..1660739 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -37,7 +37,7 @@ jobs: run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win' - name: SSLPlugin Linux if: ${{ startsWith(matrix.target, 'ubuntu') }} - run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile' + run: "sed -i '/^PLUGIN/s/$/ SSLPlugin/' Makefile && sed -i '/^LIBS/s/$/ -lcrypto -lssl/' Makefile" - name: make run: make - name: mkdir diff --git a/Makefile.Linux b/Makefile.Linux index 962d551..a9f9d4e 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -103,7 +103,7 @@ install-chroot-dir: $(INSTALL_BIN) -d $(CHROOTDIR)/libexec chmod -R o-rwx $(CHROOTDIR) -install-etc-default-config: +install-etc-default-config: install-chroot-dir if [ ! -d $(INSTALL_CFG_DEST) ]; then \ ln -s $(CHROOTREL)/conf $(INSTALL_CFG_DEST); \ $(INSTALL_BIN) $(INSTALL_CFG) $(ETCDIR)/3proxy.cfg; \