Skip to content

Commit

Permalink
Normalize output directory
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Jayman2000 committed Sep 21, 2021
1 parent 5adb0af commit 94195c8
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +27,6 @@ $(TARGET): build $(OBJECTS)
$(CC) $(OBJECTS) -o $(TARGET)

build:
@mkdir -p build
@mkdir -p bin

# The Cleaner
Expand All @@ -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_)'
Expand Down

0 comments on commit 94195c8

Please sign in to comment.