shithub: mc

Download patch

ref: 1960f69c112fec8cc78929ea6cd6596ce71abeab
parent: 22e01c4fafb7adc6a88370d5ec918a15038cd761
author: Ori Bernstein <ori@eigenstate.org>
date: Tue Jun 3 14:35:07 EDT 2014

Consolidate 'make uninstall's

--- a/libcryptohash/mk/myr.mk
+++ b/libcryptohash/mk/myr.mk
@@ -46,17 +46,13 @@
 	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 -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 -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; \