Fix build with non-GNU sed, lint variables

diff --git a/CHANGES b/CHANGES
index 483527d812e83f68fa140b39af980ea74dd94f80..b1b6226e84cad07fee614819e6afb10e735d6cb1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Release history for lariza
 
 Release history for lariza
 

+next
+  [Fixed]
+  - Build no longer depends on GNU sed.
+

 v20.05  2020-05-15
   [Changed]
   - lariza now uses native GTK tabs instead of relying on suckless
 v20.05  2020-05-15
   [Changed]
   - lariza now uses native GTK tabs instead of relying on suckless

diff --git a/Makefile b/Makefile
index ac214037046ad8b9abe625b277e0ac4c2987b1ef..f05e44880f823cd2c7acc6354511ffb6fb643a85 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 CFLAGS += -Wall -Wextra -Wno-unused-parameter -O3
 __NAME__ = lariza
 CFLAGS += -Wall -Wextra -Wno-unused-parameter -O3
 __NAME__ = lariza

-__NAME_UPPERCASE__ = `echo $(__NAME__) | sed 's/.*/\U&/'`
-__NAME_CAPITALIZED__ = `echo $(__NAME__) | sed 's/^./\U&\E/'`
+__NAME_UPPERCASE__ = LARIZA

 
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
 
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)


@@ -25,7 +24,6 @@ $(__NAME__): browser.c
        $(CC) $(CFLAGS) $(LDFLAGS) \
                -D__NAME__=\"$(__NAME__)\" \
                -D__NAME_UPPERCASE__=\"$(__NAME_UPPERCASE__)\" \
        $(CC) $(CFLAGS) $(LDFLAGS) \
                -D__NAME__=\"$(__NAME__)\" \
                -D__NAME_UPPERCASE__=\"$(__NAME_UPPERCASE__)\" \

-               -D__NAME_CAPITALIZED__=\"$(__NAME_CAPITALIZED__)\" \

                -o $@ $< \
                `pkg-config --cflags --libs gtk+-3.0 glib-2.0 webkit2gtk-4.0`
 
                -o $@ $< \
                `pkg-config --cflags --libs gtk+-3.0 glib-2.0 webkit2gtk-4.0`
 


@@ -33,7 +31,6 @@ we_adblock.so: we_adblock.c
        $(CC) $(CFLAGS) $(LDFLAGS) \
                -D__NAME__=\"$(__NAME__)\" \
                -D__NAME_UPPERCASE__=\"$(__NAME_UPPERCASE__)\" \
        $(CC) $(CFLAGS) $(LDFLAGS) \
                -D__NAME__=\"$(__NAME__)\" \
                -D__NAME_UPPERCASE__=\"$(__NAME_UPPERCASE__)\" \

-               -D__NAME_CAPITALIZED__=\"$(__NAME_CAPITALIZED__)\" \

                -shared -o $@ -fPIC $< \
                `pkg-config --cflags --libs glib-2.0 webkit2gtk-4.0`
 
                -shared -o $@ -fPIC $< \
                `pkg-config --cflags --libs glib-2.0 webkit2gtk-4.0`