From 07689046a008544c9ccd91a8358c5b536002dc71 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Sat, 27 Jul 2019 17:57:11 -0400
Subject: Use braces in Makefile

---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5cb00b5..dfe30e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CHROOT_USER = torus
-CHROOT_GROUP = $(CHROOT_USER)
+CHROOT_GROUP = ${CHROOT_USER}
 
 CFLAGS += -std=c11 -Wall -Wextra -Wpedantic
 LDFLAGS = -static
@@ -8,18 +8,18 @@ LDLIBS = -lcursesw -lutil -lz
 -include config.mk
 
 BINS = client image merge meta server
-OBJS = $(BINS:%=%.o)
+OBJS = ${BINS:%=%.o}
 
-all: tags $(BINS)
+all: tags ${BINS}
 
-$(OBJS): torus.h
+${OBJS}: torus.h
 
 client.o: help.h
 
 image.o: png.h
 
 .o:
-	$(CC) $(LDFLAGS) $< $(LDLIBS) -o $@
+	${CC} ${LDFLAGS} $< ${LDLIBS} -o $@
 
 tags: *.h *.c
 	ctags -w *.h *.c
@@ -32,25 +32,25 @@ chroot.tar: client image server default8x16.psfu
 		root/usr/share/misc \
 		root/usr/share/torus \
 		root/var/run
-	install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER)
-	install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/var/run/torus
+	install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/home/${CHROOT_USER}
+	install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/var/run/torus
 	cp -af /usr/share/locale root/usr/share
 	cp -fp /usr/share/misc/termcap.db root/usr/share/misc
 	cp -fp /rescue/sh root/bin
 	install client image server root/bin
 	install -m 644 default8x16.psfu root/usr/share/torus
-	tar -cf chroot.tar -C root bin home usr var
+	tar -c -f chroot.tar -C root bin home usr var
 
 install: chroot.tar rc.torus explore.html index.html
-	tar -xf chroot.tar -C /home/$(CHROOT_USER)
+	tar -x -f chroot.tar -C /home/${CHROOT_USER}
 	install rc.torus /usr/local/etc/rc.d/torus
-	install -o $(CHROOT_USER) -g $(CHROOT_GROUP) -m 644 \
+	install -o ${CHROOT_USER} -g ${CHROOT_GROUP} -m 644 \
 		explore.html \
 		index.html \
 		/usr/local/www/ascii.town
 
 clean:
-	rm -fr $(OBJS) $(BINS) tags root chroot.tar
+	rm -fr ${OBJS} ${BINS} tags root chroot.tar
 
 help.h:
 	head -c 4096 torus.dat \
-- 
cgit 1.4.1