From 7af3afa1ce09d91a09b2b52c04a1071cfbb8f5d7 Mon Sep 17 00:00:00 2001 From: Evan Gates Date: Fri, 20 Feb 2015 12:12:12 -0800 Subject: [PATCH] use parameter expansion instead of basename in Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4665605..337b33e 100644 --- a/Makefile +++ b/Makefile @@ -199,19 +199,19 @@ dist: clean sbase-box: $(LIB) $(SRC) mkdir -p build cp $(HDR) build - for f in $(SRC); do sed "s/^main(/`basename $$f .c`_&/" < $$f > build/$$f; done + for f in $(SRC); do sed "s/^main(/$${f%.c}_&/" < $$f > build/$$f; done echo '#include ' > build/$@.c echo '#include ' >> build/$@.c echo '#include ' >> build/$@.c echo '#include ' >> build/$@.c echo '#include "util.h"' >> build/$@.c - for f in $(SRC); do echo "int `basename $$f .c`_main(int, char **);" >> build/$@.c; done + for f in $(SRC); do echo "int $${f%.c}_main(int, char **);" >> build/$@.c; done echo 'int main(int argc, char *argv[]) { char *s = basename(argv[0]); if(!strcmp(s,"sbase-box")) { argc--; argv++; s = basename(argv[0]); } if(0) ;' >> build/$@.c echo "else if (!strcmp(s, \"[\")) return test_main(argc, argv);" >> build/$@.c - for f in $(SRC); do echo "else if(!strcmp(s, \"`basename $$f .c`\")) return `basename $$f .c`_main(argc, argv);" >> build/$@.c; done + for f in $(SRC); do echo "else if(!strcmp(s, \"$${f%.c}\")) return $${f%.c}_main(argc, argv);" >> build/$@.c; done echo 'else {' >> build/$@.c echo "printf(\"[\"); putchar(' ');" >> build/$@.c - for f in $(SRC); do echo "printf(\"`basename $$f .c`\"); putchar(' ');" >> build/$@.c; done + for f in $(SRC); do echo "printf(\"$${f%.c}\"); putchar(' ');" >> build/$@.c; done echo "putchar(0xa); }; return 0; }" >> build/$@.c $(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ build/*.c $(LIB) rm -r build -- 2.3.0