make uhc DESTDIR= friendly #8

Merged
merged 1 commit into from Nov 15, 2012
+7 −7
Split
View
@@ -253,19 +253,19 @@ FUN_INSTALLUHC_COPY = \
uhc: $(EHC_FOR_UHC_BLD_EXEC) $(EHC_UHC_INSTALL_VARIANT)/ehclibs
uhc-install: uhc
- @rm -f $(UHC_INSTALL_EXEC)
- @$(call FUN_INSTALLUHC_COPY,$(UHC_INSTALL_VARIANT_PREFIX),$(UHC_INSTALL_PREFIX)) ; \
- rm -f $(UHC_INSTALL_EXEC) ; \
- mkdir -p $(INSTALL_UHC_BIN_PREFIX) ; \
- $(call FUN_INSTALLUHC_WRAPPER,$(UHC_INSTALL_EHCBINARY),$(UHC_INSTALL_SHELL),$(INSTALL_UHC_BIN_PREFIX),$(TOPLEVEL_SYSTEM_ABSPATH_PREFIX)$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME))
+ @rm -f $(DESTDIR)$(UHC_INSTALL_EXEC)
+ @$(call FUN_INSTALLUHC_COPY,$(UHC_INSTALL_VARIANT_PREFIX),$(DESTDIR)$(UHC_INSTALL_PREFIX)) ; \
+ rm -f $(DESTDIR)$(UHC_INSTALL_EXEC) ; \
+ mkdir -p $(DESTDIR)$(INSTALL_UHC_BIN_PREFIX) ; \
+ $(call FUN_INSTALLUHC_WRAPPER,$(UHC_INSTALL_EHCBINARY),$(DESTDIR)$(UHC_INSTALL_SHELL),$(DESTDIR)$(INSTALL_UHC_BIN_PREFIX),$(TOPLEVEL_SYSTEM_ABSPATH_PREFIX)$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME))
@echo "Installation done"
# ln -s $(UHC_INSTALL_EHCBINARY) $(UHC_INSTALL_EXEC)
# $(UHC_INSTALL_EXEC) --meta-export-env=$(TOPLEVEL_SYSTEM_ABSPATH_PREFIX)$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME)
uhc-uninstall:
- @echo "Removing installation $(UHC_INSTALL_PREFIX) ..."
- rm -fr $(UHC_INSTALL_PREFIX) $(UHC_INSTALL_EXEC)
+ @echo "Removing installation $(DESTDIR)$(UHC_INSTALL_PREFIX) ..."
+ rm -fr $(DESTDIR)$(UHC_INSTALL_PREFIX) $(DESTDIR)$(UHC_INSTALL_EXEC)
uhc-install-postprocess-bc:
# @cd $(call FUN_DIR_VARIANT_LIB_TARGET_PREFIX,$(INSTALL_UHC_ROOT),$(UHC_INSTALL_VARIANTNAME),$(EHC_VARIANT_TARGET)) ; \