summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2014-06-03 18:35:07 -0400
committerOri Bernstein <ori@eigenstate.org>2015-08-24 22:10:06 -0700
commit1960f69c112fec8cc78929ea6cd6596ce71abeab (patch)
tree51735b5e933149d15722c80cfe0635606655ef68
parent22e01c4fafb7adc6a88370d5ec918a15038cd761 (diff)
downloadmc-1960f69c112fec8cc78929ea6cd6596ce71abeab.tar.gz
Consolidate 'make uninstall's
-rw-r--r--libcryptohash/mk/myr.mk14
1 files changed, 2 insertions, 12 deletions
diff --git a/libcryptohash/mk/myr.mk b/libcryptohash/mk/myr.mk
index 35a4a86..4c530ca 100644
--- a/libcryptohash/mk/myr.mk
+++ b/libcryptohash/mk/myr.mk
@@ -46,17 +46,13 @@ clean: subdirs-clean
rm -f $(USE)
rm -f lib$(MYRLIB).a
-install: subdirs-install install-bin install-lib install-man
-uninstall: subdirs-uninstall uninstall-bin uninstall-lib uninstall-man
-install-bin: $(MYRBIN)
+install: subdirs-install $(MYRBIN) $(_LIBNAME) $(MAN)
@if [ ! -z "$(MYRBIN)" ]; then \
echo install $(MYRBIN) $(INST_ROOT)/bin; \
mkdir -p $(INST_ROOT)/bin; \
install $(MYRBIN) $(INST_ROOT)/bin; \
fi
-
-install-lib: $(_LIBNAME)
@if [ ! -z "$(_LIBNAME)" ]; then \
echo install -m 644 $(_LIBNAME) $(INST_ROOT)/lib/myr; \
echo install -m 644 $(MYRLIB) $(INST_ROOT)/lib/myr; \
@@ -64,8 +60,6 @@ install-lib: $(_LIBNAME)
install -m 644 $(_LIBNAME) $(INST_ROOT)/lib/myr; \
install -m 644 $(MYRLIB) $(INST_ROOT)/lib/myr; \
fi
-
-install-man:
@for i in $(MAN); do \
MANSECT=$$(echo $$i | awk -F. '{print $$NF}'); \
echo mkdir -p $(INST_ROOT)/share/man/man$$MANSECT; \
@@ -74,19 +68,15 @@ install-man:
install -m 644 $(MAN) $(INST_ROOT)/share/man/man$${MANSECT}; \
done \
-uninstall-bin: $(MYRBIN)
+uninstall: subdirs-uninstall
@for i in $(MYRBIN); do \
echo rm -f $(INST_ROOT)/bin/$$i; \
rm -f $(INST_ROOT)/bin/$$i; \
done
-
-uninstall-lib: $(_LIBNAME)
@for i in $(_LIBNAME) $(MYRLIB); do \
echo rm -f $(INST_ROOT)/lib/myr/$$i; \
rm -f $(INST_ROOT)/lib/myr/$$i; \
done
-
-uninstall-man:
@for i in $(MAN); do \
MANSECT=$$(echo $$i | awk -F. '{print $$NF}'); \
echo rm -f $(INST_ROOT)/share/man/man$${MANSECT}/$$i; \