mirror of
https://github.com/rkd77/elinks.git
synced 2025-02-02 15:09:23 -05:00
Remove the leading slash from the relative path being printed
... pasky likes it not.
This commit is contained in:
parent
2b6bdfd627
commit
8eafb441df
@ -17,6 +17,7 @@ endif
|
|||||||
CURPATH = $(shell pwd)
|
CURPATH = $(shell pwd)
|
||||||
TOPPATH = $(shell cd $(path_to_top) && pwd)
|
TOPPATH = $(shell cd $(path_to_top) && pwd)
|
||||||
RELPATH = $(shell echo '$(CURPATH)' | sed 's,$(TOPPATH),,')
|
RELPATH = $(shell echo '$(CURPATH)' | sed 's,$(TOPPATH),,')
|
||||||
|
RELPATH = $(shell echo '$(CURPATH)' | sed 's,$(TOPPATH),,;s,^/,,;s,\([a-z]\)$$,\1/,')
|
||||||
|
|
||||||
# Show the command (quiet or non-quiet version based on the assignment
|
# Show the command (quiet or non-quiet version based on the assignment
|
||||||
# just above) and then execute it.
|
# just above) and then execute it.
|
||||||
@ -24,19 +25,19 @@ ncmd = $(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
|
|||||||
cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
|
cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
|
||||||
mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1))
|
mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1))
|
||||||
|
|
||||||
quiet_cmd_compile = ' [CC] $(RELPATH)/$<'
|
quiet_cmd_compile = ' [CC] $(RELPATH)$<'
|
||||||
masq_cmd_compile = $(COMPILE) -c $<
|
masq_cmd_compile = $(COMPILE) -c $<
|
||||||
cmd_compile = $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
cmd_compile = $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||||
|
|
||||||
# Rule to compile a set of .o files into one .o file
|
# Rule to compile a set of .o files into one .o file
|
||||||
quiet_cmd_ld_objs = " [LD] $(RELPATH)/$@"
|
quiet_cmd_ld_objs = " [LD] $(RELPATH)$@"
|
||||||
cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^)
|
cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^)
|
||||||
|
|
||||||
quiet_cmd_link = ' [LINK] $(RELPATH)/$@'
|
quiet_cmd_link = ' [LINK] $(RELPATH)$@'
|
||||||
cmd_link = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
cmd_link = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||||
|
|
||||||
# Recursive make
|
# Recursive make
|
||||||
quiet_cmd_recmake = "[MAKE $$target] $(RELPATH)/$$subdir"
|
quiet_cmd_recmake = "[MAKE $$target] $(RELPATH)$$subdir"
|
||||||
cmd_recmake = $(MAKE) -C $$subdir $$target
|
cmd_recmake = $(MAKE) -C $$subdir $$target
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user