Fixed bugs in escaping - makefile
This commit is contained in:
parent
9bd2f4dd06
commit
1338b0ca40
13
GNUmakefile
13
GNUmakefile
|
@ -12,11 +12,16 @@ dwmblocks: dwmblocks.c config.h block.h
|
||||||
${CC} -o $@ -Wno-missing-field-initializers -Wno-unused-parameter ${CFLAGS} ${X11CFLAGS} $< ${X11LIBS}
|
${CC} -o $@ -Wno-missing-field-initializers -Wno-unused-parameter ${CFLAGS} ${X11CFLAGS} $< ${X11LIBS}
|
||||||
|
|
||||||
E0BLOCKS = $(abspath blocks)
|
E0BLOCKS = $(abspath blocks)
|
||||||
# two level escaping of '\', one for sed and one for C
|
# two level escaping of `\', one for sed and one for C
|
||||||
E1BLOCKS = $(subst \,\\\\,${E0BLOCKS})
|
E1BLOCKS = $(subst \,\\\\,${E0BLOCKS})
|
||||||
# escaping special character '&' and delimiter '=' for sed
|
# escaping special character `&' and delimiter `=' for sed
|
||||||
E2BLOCKS = $(subst &,\&,${E1BLOCKS})
|
E3BLOCKS = $(subst &,\&,${E2BLOCKS})
|
||||||
EFBLOCKS = $(subst =,\=,${E2BLOCKS})
|
E4BLOCKS = $(subst =,\=,${E3BLOCKS})
|
||||||
|
# escaping `"' for C
|
||||||
|
E2BLOCKS = $(subst ",\\",${E1BLOCKS})
|
||||||
|
# escaping `'' for shell
|
||||||
|
EFBLOCKS = $(subst ','\'',${E4BLOCKS})
|
||||||
|
# this comment is a workaround for syntax highlighting bug in vim')
|
||||||
|
|
||||||
config.h:
|
config.h:
|
||||||
sed '2s=<path to the folder containing block scripts>=${EFBLOCKS}=' config.def.h >$@
|
sed '2s=<path to the folder containing block scripts>=${EFBLOCKS}=' config.def.h >$@
|
||||||
|
|
Loading…
Reference in a new issue