From e3c875a16c52c90f082b62d70251c496deae88b9 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Mon, 20 Sep 2021 20:28:43 -0400 Subject: [PATCH] Normalize output directory Previously, one target would send isextract to build, one would send it to lib, and another would create an unused bin folder. This change makes isextract more consistent with itself and more consistent with Unix tradition. --- .gitignore | 1 - Makefile | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 98e1076..2ed14da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -build bin nbproject/ *.a diff --git a/Makefile b/Makefile index 2550220..83988e4 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ OBJECTS=$(patsubst %.cpp,%.o,$(SOURCES)) TEST_SRC=$(wildcard tests/*_tests.cpp) TESTS=$(patsubst %.cpp,%,$(TEST_SRC)) -TARGET=build/isextract +TARGET=bin/isextract SO_TARGET=$(patsubst %.a,%.so,$(TARGET)) # The Target Build @@ -27,7 +27,6 @@ $(TARGET): build $(OBJECTS) $(CC) $(OBJECTS) -o $(TARGET) build: - @mkdir -p build @mkdir -p bin # The Cleaner @@ -39,8 +38,8 @@ clean: # The Install install: all - install -d $(DESTDIR)/$(PREFIX)/lib/ - install $(TARGET) $(DESTDIR)/$(PREFIX)/lib/ + install -d $(DESTDIR)/$(PREFIX)/bin/ + install $(TARGET) $(DESTDIR)/$(PREFIX)/bin/ # The Checker BADFUNCS='[^_.>a-zA-Z0-9](str(n?cpy|n?cat|xfrm|n?dup|str|pbrk|tok|_)|stpn?cpy|a?sn?printf|byte_)'