From: torrinfail <torrinfail@gmail.com>
Date: Tue, 28 Jul 2020 17:06:04 +0000 (-0600)
Subject: Merge branch 'master' into patch-1
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=7a570d5760759329692f98b3514662cf673ea92e;p=dwmblocks.git

Merge branch 'master' into patch-1
---

7a570d5760759329692f98b3514662cf673ea92e
diff --cc Makefile
index b12bff6,3336e3c..ad7e701
--- a/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  PREFIX ?= /usr/local
- 
+ CC ?= cc
  output: dwmblocks.c blocks.h
- 	cc dwmblocks.c `pkg-config --cflags x11` `pkg-config --libs x11` -o dwmblocks
 -	${CC} `pkg-config --cflags x11` `pkg-config --libs x11` dwmblocks.c -o dwmblocks
++	${CC} dwmblocks.c `pkg-config --cflags x11` `pkg-config --libs x11` -o dwmblocks
  clean:
  	rm -f *.o *.gch dwmblocks
  install: output