From caaec0b4d669ad6d523647f2f7bc311cc4c9776c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Aug 2009 13:39:51 +0000
Subject: [PATCH] pkgs/applications/editors/emacs-23/builder.sh: recognize path
 of 64-bit crt{1,i,n}.o files

Deja vu?

svn path=/nixpkgs/trunk/; revision=16591
---
 pkgs/applications/editors/emacs-23/builder.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-23/builder.sh b/pkgs/applications/editors/emacs-23/builder.sh
index 677311c4fd3..a975fa4601e 100644
--- a/pkgs/applications/editors/emacs-23/builder.sh
+++ b/pkgs/applications/editors/emacs-23/builder.sh
@@ -4,13 +4,21 @@ preConfigure() {
     libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
     echo "libc: $libc"
 
+    case "${system}" in
+	x86_64-*)	glibclibdir=lib64 ;;
+	*)		glibclibdir=lib ;;
+    esac
+
     for i in src/s/*.h src/m/*.h; do
         substituteInPlace $i \
-            --replace /usr/lib/crt1.o $libc/lib/crt1.o \
-            --replace /usr/lib/crti.o $libc/lib/crti.o \
-            --replace /usr/lib/crtn.o $libc/lib/crtn.o
+            --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
+            --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
+            --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
+            --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
+            --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
+            --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
     done
-    
+
     for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
         substituteInPlace $i --replace /bin/pwd pwd
     done