From 5ea071a53492ec9512f8d08a8b8ff8e08499209d Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 27 Aug 2013 01:57:50 -0700
Subject: Tue Aug 27 01:56:38 PDT 2013

---
 community/gdc/folders.diff | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'community/gdc/folders.diff')

diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff
index 738a7e6cd..05fc9991a 100644
--- a/community/gdc/folders.diff
+++ b/community/gdc/folders.diff
@@ -1,29 +1,30 @@
 diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
-index 5bdab1b..aa1122e 100644
+index 9570bf3..52addc0 100644
 --- a/gcc/d/Make-lang.in
 +++ b/gcc/d/Make-lang.in
-@@ -25,9 +25,9 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor
+@@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor
  
  # This should be configured
  ifeq ($(host), $(target))
--  gcc_d_include_dir = $(prefix)/include/d/$(version)
-+  gcc_d_include_dir = $(prefix)/include/dlang/gdc/$(version)
+-  D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/d/$(version)
++  D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc/$(version)
+   gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..$(D_include_dir)
  else
 -  gcc_d_include_dir = $(libsubdir)/include/d
 +  gcc_d_include_dir = $(libsubdir)/include/dlang/gdc
  endif
  
  
-diff --git a/libphobos/configure.in b/libphobos/configure.in
-index f6b3660..7e88b23 100644
---- a/libphobos/configure.in
-+++ b/libphobos/configure.in
-@@ -232,9 +232,9 @@ dnl (# Default case for install directory for include files.) and on
+diff --git a/libphobos/configure.ac b/libphobos/configure.ac
+index dfb8fec..0b88ff4 100644
+--- a/libphobos/configure.ac
++++ b/libphobos/configure.ac
+@@ -220,9 +220,9 @@ dnl (# Default case for install directory for include files.) and on
  # will have to modify gcc/configure.ac ..
  # For now, basic workaround for cross compilers ..
  if test "${host}" != "${build}"; then
 -    gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d
-+    gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang/gdc
++    gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang/
  else
 -    gdc_include_dir='${prefix}'/include/d/${d_gcc_ver}
 +    gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver}
-- 
cgit v1.2.3-54-g00ecf