From f7f2f5e84ff19c802af28c09aca5177c8dc6fa68 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Mon, 24 Jun 2019 08:21:07 -0400 Subject: [PATCH] Address #129. Don't rm -rf the wrong directory on uninstall. --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e71c2933..6e1dfb2c 100644 --- a/Makefile +++ b/Makefile @@ -305,6 +305,15 @@ install: $(JANET_TARGET) $(PKG_CONFIG_PATH)/janet.pc cp janet.1 $(MANPATH) -ldconfig $(LIBDIR) +uninstall: + -rm $(BINDIR)/janet + -rm $(BINDIR)/jpm + -rm -rf $(INCLUDEDIR)/janet + -rm -rf $(LIBDIR)/libjanet.* + -rm $(PKG_CONFIG_PATH)/janet.pc + -rm $(MANPATH)/janet.1 + # -rm -rf $(JANET_PATH)/* - err on the side of correctness here + ################# ##### Other ##### ################# @@ -332,9 +341,5 @@ build/embed_test: build/embed_janet.o build/embed_main.o test-amalg: build/embed_test ./build/embed_test -uninstall: - -rm $(BINDIR)/../$(JANET_TARGET) - -rm -rf $(INCLUDEDIR) - .PHONY: clean install repl debug valgrind test amalg \ valtest emscripten dist uninstall docs grammar format