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

targets-tools.mk: Fix HDRDIR_SCOPE_SUFFIX for nested include dir structure

Browse source 
The attempt to have local include directory with HDRDIR_SCOPE_SUFFIX
pointing to the working directory failed the last time around. This
commit tries to fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-01-30 16:23:29 +00:00
commit f1d9bba070
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
make/targets-tools.mk
View file

@ -22,7 +22,8 @@ clean-link: clean.link
#all.link: $(HDRDIR_SCOPE_SUFFIX) #all.link: $(HDRDIR_SCOPE_SUFFIX)
$(HDRDIR_SCOPE_SUFFIX): $(HDRDIR_SCOPE_SUFFIX):
ln -s . $@ mkdir -p $(dir $(HDRDIR_SCOPE_SUFFIX))
ln -s $(shell realpath -m . --relative-to $(dir $(HDRDIR_SCOPE_SUFFIX))) $@
ifeq ($(SCOPE_PREFIX),) ifeq ($(SCOPE_PREFIX),)
#all.link: $(BUILD_HDRDIR)/$(HDRDIR_SCOPE_SUFFIX) #all.link: $(BUILD_HDRDIR)/$(HDRDIR_SCOPE_SUFFIX)
@ -33,13 +34,17 @@ endif
$(LIB_SO): $(OBJ) $(LIB_SO): $(OBJ)
all.done: $(PREREQ_DONE) $(BUILD_HDR) $(BUILD_EXE_SH) $(MEMBERS) $(LIB_A) $(LIB_SO) $(HDRDIR_SCOPE_SUFFIX) all.done: $(PREREQ_DONE) $(BUILD_HDR) $(BUILD_EXE_SH) $(MEMBERS) $(LIB_A) $(LIB_SO) | $(HDRDIR_SCOPE_SUFFIX)
endif endif
clean: objclean textclean localclean profclean clean.link clean: objclean textclean localclean profclean clean.link
clean.link: clean.link:
if [ -L "$(HDRDIR_SCOPE_SUFFIX)" -a "`readlink $(HDRDIR_SCOPE_SUFFIX) 2>/dev/null`" = . ]; then rm $(HDRDIR_SCOPE_SUFFIX); fi if [ -L "$(HDRDIR_SCOPE_SUFFIX)" -a "`realpath --relative-to . $(HDRDIR_SCOPE_SUFFIX) 2>/dev/null`" = . ]; then \
rm $(HDRDIR_SCOPE_SUFFIX) ;\
rmdir -p $(dir $(HDRDIR_SCOPE_SUFFIX)) 2>/dev/null || : ;\
fi
endif # ifndef TARGETS_TOOLS_MK_INCLUDED endif # ifndef TARGETS_TOOLS_MK_INCLUDED