janware/jw-pkg
1
Code Pull requests Activity Actions

defs.mk: Use EXE_SH for shell scripts only

Browse source 
To make EXE_SH useful for automated shell syntax checking, remove all non POSIX shell / bash scripts from that variable, and place the non-shell scripts into EXE_SCRIPTS.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-19 12:47:28 +02:00
commit e59d37e907
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs.mk
View file

@ -356,17 +356,18 @@ INSTALLED_DOC ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
# -- EXE # -- EXE
INSTALLATION_FILE_TYPES += EXE INSTALLATION_FILE_TYPES += EXE
EXE_SH += $(filter-out $(DONT_INSTALL),$(wildcard *.sh *.pl *.pm *.py *.bat *.feedfs)) EXE_SH += $(wildcard *.sh)
EXE_SH += $(patsubst %.sh.tmpl,%.sh,$(filter-out $(DONT_INSTALL),$(wildcard *.sh.tmpl))) EXE_SH += $(patsubst %.sh.tmpl,%.sh,$(filter-out $(DONT_INSTALL),$(wildcard *.sh.tmpl)))
EXE_SCRIPTS += $(EXE_SH) $(filter-out $(DONT_INSTALL),$(wildcard *.pl *.pm *.py *.bat *.feedfs))
#EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*) #EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*)
BUILD_EXE_BIN += $(addprefix $(BUILD_EXEDIR)/,$(EXE) $(EXE_SH)) BUILD_EXE_BIN += $(addprefix $(BUILD_EXEDIR)/,$(EXE) $(EXE_SCRIPTS))
INSTALLED_EXE_BIN += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_BIN)) INSTALLED_EXE_BIN += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_BIN))
BUILD_EXEDIR = $(TOPDIR)/bin BUILD_EXEDIR = $(TOPDIR)/bin
INSTALL_EXEDIR ?= $(EXE_PREFIX)/bin INSTALL_EXEDIR ?= $(EXE_PREFIX)/bin
BUILD_EXE += $(BUILD_EXE_BIN) BUILD_EXE += $(BUILD_EXE_BIN)
INSTALLED_EXE += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SH)) $(INSTALLED_EXE_BIN) INSTALLED_EXE += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SCRIPTS)) $(INSTALLED_EXE_BIN)
# -- CGI # -- CGI
INSTALLATION_FILE_TYPES += CGI INSTALLATION_FILE_TYPES += CGI

2
make/rules.mk
View file

@ -58,8 +58,6 @@ installexe: all checkroot $(INSTALLED_EXE)
installso: all checkroot install_dir_LIB $(INSTALLED_SHOBJS) installso: all checkroot install_dir_LIB $(INSTALLED_SHOBJS)
installsh: all checkroot $(INSTALL_EXEDIR) $(INSTALLED_EXE_SH)
pckgclean: pckgclean:
$(RM) -rf *.zip *.tar.gz *.rpm *.deb $(RM) -rf *.zip *.tar.gz *.rpm *.deb