shithub: mc

Download patch

ref: 0f95e4517ef3aa5d719b0ba8a20e8c64e96b0c46
parent: 6b0f942d7b95740123e84dbd8aeab15f336a18c6
author: Ori Bernstein <ori@eigenstate.org>
date: Thu Jun 12 12:11:38 EDT 2014 

Update the makefile template


--- a/libcryptohash/mk/myr.mk
+++ b/libcryptohash/mk/myr.mk
@@ -59,38 +59,38 @@
 
 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; \
+	    echo install $(MYRBIN) $(abspath $(DESTDIR)/$(INST_ROOT)/bin); \
+	    mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/bin); \
+	    install $(MYRBIN) $(abspath $(DESTDIR)/$(INST_ROOT)/bin); \
 	fi
 	@if [ ! -z "$(_LIBNAME)" ]; then \
-		echo install -m 644 $(_LIBNAME) $(INST_ROOT)/lib/myr; \
-		echo install -m 644 $(MYRLIB) $(INST_ROOT)/lib/myr; \
-		mkdir -p $(INST_ROOT)/lib/myr; \
-		install -m 644 $(_LIBNAME) $(INST_ROOT)/lib/myr; \
-		install -m 644 $(MYRLIB) $(INST_ROOT)/lib/myr; \
+		echo install -m 644 $(_LIBNAME) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
+		echo install -m 644 $(MYRLIB) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
+		mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr; \
+		install -m 644 $(_LIBNAME) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
+		install -m 644 $(MYRLIB) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
 	fi
 	@for i in $(MAN); do \
 	    MANSECT=$$(echo $$i | awk -F. '{print $$NF}'); \
-	    echo mkdir -p $(INST_ROOT)/share/man/man$$MANSECT; \
-	    echo install -m 644 $(MAN) $(INST_ROOT)/share/man/man$${MANSECT}; \
-	    mkdir -p $(INST_ROOT)/share/man/man$$MANSECT; \
-	    install -m 644 $(MAN) $(INST_ROOT)/share/man/man$${MANSECT}; \
+	    echo mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$$MANSECT); \
+	    echo install -m 644 $(MAN) $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}); \
+	    mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$$MANSECT); \
+	    install -m 644 $(MAN) $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}); \
 	done \
 
 uninstall: subdirs-uninstall
 	@for i in $(MYRBIN); do \
-	    echo rm -f $(INST_ROOT)/bin/$$i; \
-	    rm -f $(INST_ROOT)/bin/$$i; \
+	    echo rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/bin/$$i); \
+	    rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/bin/$$i); \
 	done
 	@for i in $(_LIBNAME) $(MYRLIB); do \
-	    echo rm -f $(INST_ROOT)/lib/myr/$$i; \
-	    rm -f $(INST_ROOT)/lib/myr/$$i; \
+	    echo rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr/$$i); \
+	    rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr/$$i); \
 	done
 	@for i in $(MAN); do \
 	    MANSECT=$$(echo $$i | awk -F. '{print $$NF}'); \
-	    echo rm -f $(INST_ROOT)/share/man/man$${MANSECT}/$$i; \
-	    rm -f $(INST_ROOT)/share/man/man$${MANSECT}/$$i; \
+	    echo rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}/$$i); \
+	    rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}/$$i); \
 	done
 
 config.mk: