Correct prefix / CFG_PREFIX work in configure / install.mk

diff --git a/configure b/configure
index c49601bfd9f2fdc2f357417c4d362a103e6ddea9..0f965fca60880b9a670daa7674052e0fa637e13e 100755 (executable)
--- a/configure
+++ b/configure
@@ -394,10 +394,11 @@ valopt target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
 
 valopt localstatedir "/var/lib" "local state directory"
 valopt sysconfdir "/etc" "install system configuration files"
-valopt datadir "/usr/share" "install data"
-valopt infodir "/usr/share/info" "install additional info"
-valopt mandir "/usr/share/man" "install man pages in PATH"
-valopt libdir "/usr/lib" "install libraries"
+
+valopt datadir "${CFG_PREFIX}/share" "install data"
+valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
+valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
+valopt libdir "${CFG_PREFIX}/lib" "install libraries" 
 
 #Deprecated opts to keep compatibility
 valopt build-triple "${DEFAULT_BUILD}" "LLVM build triple"

diff --git a/mk/install.mk b/mk/install.mk
index 260e6bc0379680b3ac46893ea8b59e635da7651d..7bedcf812f4ea92f7806ba606fb1112a5dbedf9d 100644 (file)
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -139,7 +139,7 @@ install-host: LIB_DESTIN_DIR=$(PHL)
 install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
        $(Q)$(call MK_INSTALL_DIR,$(PREFIX_BIN))
        $(Q)$(call MK_INSTALL_DIR,$(PREFIX_LIB))
-       $(Q)$(call MK_INSTALL_DIR,$(PREFIX_ROOT)/share/man/man1)
+       $(Q)$(call MK_INSTALL_DIR,$(CFG_MANDIR/man1)
        $(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD)))
        $(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD)))
        $(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD)))
@@ -152,9 +152,9 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
        $(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD)))
        $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD)))
        $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD)))
-       $(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustc.1)
-       $(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustdoc.1)
-       $(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustpkg.1)
+       $(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR/man1,rustc.1)
+       $(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR/man1,rustdoc.1)
+       $(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR/man1,rustpkg.1)
 
 install-targets: $(INSTALL_TARGET_RULES)
 
@@ -180,10 +180,10 @@ uninstall:
         do rm -f $$i ; \
         done
        $(Q)rm -Rf $(PHL)/rustc
-       $(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rustc.1
-       $(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rustdoc.1
-       $(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rusti.1
-       $(Q)rm -f $(PREFIX_ROOT)/$(CFG_MANDIR)/man1/rustpkg.1
+       $(Q)rm -f $(CFG_MANDIR)/man1/rustc.1
+       $(Q)rm -f $(CFG_MANDIR)/man1/rustdoc.1
+       $(Q)rm -f $(CFG_MANDIR)/man1/rusti.1
+       $(Q)rm -f $(CFG_MANDIR)/man1/rustpkg.1
 
 # target platform specific variables
 # for arm-linux-androidabi