diff options
| author | Ismael Luceno | 2021-11-11 21:10:15 +0100 |
|---|---|---|
| committer | Ismael Luceno | 2021-11-11 21:15:17 +0100 |
| commit | 469379f6460c36db6697db482def6f312ffdc196 (patch) | |
| tree | 506311d37c15ae1d9653c2ee241efd5d6b769567 /utils | |
| parent | 23b9f66bb352896561efcafcb4f4f02967251777 (diff) | |
dmenu: Simplify patching of config.mk
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/dmenu/HISTORY | 3 | ||||
| -rwxr-xr-x | utils/dmenu/PRE_BUILD | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY index 30e2eb42bb..0b0baff51a 100644 --- a/utils/dmenu/HISTORY +++ b/utils/dmenu/HISTORY @@ -1,3 +1,6 @@ +2021-11-11 Ismael Luceno <ismael@sourcemage.org> + * PRE_BUILD: simplified patching of config.mk + 2020-11-25 Vlad Glagolev <stealth@sourcemage.org> * DETAILS, PRE_BUILD, PREPARE, fuzzy*.patch: add fuzzymatch and fuzzyhighlight patches options diff --git a/utils/dmenu/PRE_BUILD b/utils/dmenu/PRE_BUILD index 0bfab5530c..90a4b9eccd 100755 --- a/utils/dmenu/PRE_BUILD +++ b/utils/dmenu/PRE_BUILD @@ -61,12 +61,9 @@ if is_version_less $(installed_version fontconfig) 2.11.91; then echo '#define FC_COLOR "color"' >> drw.h fi && -#right install paths -sedit "s/\/usr\/local/${INSTALL_ROOT}\/usr/" config.mk && -sedit "s/\${PREFIX}\/etc/${INSTALL_ROOT}\/etc/" config.mk && - -sedit "s:^CXXFLAGS \+=:CXXFLAGS = ${CXXFLAGS} :" config.mk && -sedit "s:^CFLAGS \+=:CFLAGS = ${CFLAGS} :" config.mk && -sedit "s:^LDFLAGS \+=:LDFLAGS = ${LDFLAGS} :" config.mk && - -sedit "s:/X11R6::" config.mk +# Fix flags and system paths +sedit ' + /^PREFIX *=/{s@=.*@= '"$INSTALL_ROOT"'/usr@} + /^\(C\|LD\)FLAGS *=/{s@=@+=@} + s@= *-[IL][$](X11...)@=@ +' config.mk |