janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-20 13:37:38 +01:00
Code Activity

Everywhere: Rename MODDIR -> JWBDIR

Browse source 
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:34:18 +00:00
commit b2d6e6f554
109 changed files with 279 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/zip-windows-files.mk
View file

@ -37,10 +37,10 @@ $(WINLIB): $(REQUIRED_H)
xargs tar -cf - | tar -C $(DISTDIR)/src/$(PROJECT) -xf -
echo $(DIST_VERSION) > $(DISTDIR)/src/$(PROJECT)/VERSION ;\
set -e; for mod in $(REQUIRED) ; do \
make -C $(MODDIR)/$$mod clean ;\
make -C $(JWBDIR)/$$mod clean ;\
mkdir -p $(DISTDIR)/src/$(PROJECT)/mod/$$mod ;\
echo `ls $(MODDIR)/$$mod/*.h`; \
modfiles="`find $(MODDIR)/$$mod -maxdepth 1 -name *.h -o -name *.c -o -name *.cpp`"; \
echo `ls $(JWBDIR)/$$mod/*.h`; \
modfiles="`find $(JWBDIR)/$$mod -maxdepth 1 -name *.h -o -name *.c -o -name *.cpp`"; \
echo "++++ $$modfiles"; \
if [ -n "$$modfiles" ]; then cp $$modfiles $(DISTDIR)/src/$(PROJECT)/mod/$$mod/; fi\
done ;\
@ -55,6 +55,6 @@ $(WINLIB): $(REQUIRED_H)
$(SED) $$dir/Makefile -e "s/^TOPDIR\ *=.*/TOPDIR = \.\.\/\.\./g" > $(DISTDIR)/src/$(PROJECT)/mod/$$mod/Makefile ;\
fi; \
done ;\
cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/
cp $(JWBDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/
cd $(DISTDIR)/src; zip -r $(notdir $@) $(PROJECT)
mv $(DISTDIR)/src/$(notdir $@) $@