---

yaml
---
r: 146323
b: refs/heads/try2
c: 1c4a348
h: refs/heads/master
i:
  146321: 10c817b
  146319: f932502
v: v3

Author: cnd

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8a593a8bdb36b4980f9c1b83e7f55af72dba789f
+refs/heads/try2: 1c4a348b072a1b6191ac349aefffcc1c5fe84de7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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"

branches/try2/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