From 352ceb166cce2db217933dbef87b9a8b8c22d353 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 15 May 2013 11:59:51 +0200 Subject: [PATCH] Renamed [un]install goals to [un]avail. The [un]install make goals have a rather fixed meaning for *ix users. The simple symlinks provided here don't match the expectations users have from [un]install. Therefore it is appropriate to rename them to "something" not tied to specific expectations. --- Makefile | 4 ++-- src/Makefile | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0233e042b..d5a522871 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ all mostlyclean clean: @$(MAKE) -C src --no-print-directory $@ @$(MAKE) -C libsrc --no-print-directory $@ -install uninstall bin: +avail unavail bin: @$(MAKE) -C src --no-print-directory $@ lib: @@ -14,6 +14,6 @@ lib: %: @$(MAKE) -C libsrc --no-print-directory $@ -.PHONY: all mostlyclean clean install uninstall bin lib +.PHONY: all mostlyclean clean avail unavail bin lib .SUFFIXES: diff --git a/src/Makefile b/src/Makefile index 959478901..e316067d2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,7 +26,7 @@ LDLIBS += -lm .SUFFIXES: -.PHONY: all bin $(PROGS) mostlyclean clean install uninstall +.PHONY: all bin $(PROGS) mostlyclean clean avail unavail all bin: $(PROGS) @@ -36,15 +36,15 @@ mostlyclean: clean: $(RM) -r ../wrk ../bin -install: all - $(foreach prog,$(PROGS),$(INSTALL_recipe)) +avail: all + $(foreach prog,$(PROGS),$(AVAIL_recipe)) -uninstall: - $(foreach prog,$(PROGS),$(UNINSTALL_recipe)) +unavail: + $(foreach prog,$(PROGS),$(UNAVAIL_recipe)) ########## -define INSTALL_recipe +define AVAIL_recipe ln -s $(abspath ../bin/$(prog)) /usr/local/bin/$(prog) @@ -52,7 +52,7 @@ endef ########## -define UNINSTALL_recipe +define UNAVAIL_recipe $(RM) /usr/local/bin/$(prog) -- 2.39.5