From d5926e216b478cbde9668b547f3ea858c8694bae Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 23 Apr 2012 21:32:01 -0400
Subject: Remove superfluous directory settings in 'build'.

---
(limited to 'build')

diff --git a/build b/build
index cba437d..3d287c9 100755
--- a/build
+++ b/build
@@ -18,9 +18,6 @@ infodir = $(prefix)/share/info
 localedir = $(prefix)/lib/locale
 mandir = $(prefix)/share/man
 docdir = $(prefix)/share/doc
-rootsbindir = /sbin
-rtlddir = /lib
-slibdir = /lib
 
 $(PKGS): eglibc.stamp
 
@@ -40,29 +37,13 @@ eglibc.configure.stamp: eglibc.setup.stamp
 		echo 'libc_cv_gnu89_inline=yes' >> config.cache && \
 		echo 'libc_cv_ssp=no' >> config.cache && \
 		rm -f configparams && \
-		echo 'bindir = $(bindir)' >> configparams && \
-		echo 'sbindir = $(sbindir)' >> configparams && \
-		echo 'libexecdir = $(libexecdir)' >> configparams && \
-		echo 'sysconfdir = $(sysconfdir)' >> configparams && \
-		echo 'libdir = $(libdir)' >> configparams && \
-		echo 'includedir = $(includedir)' >> configparams && \
-		echo 'datarootdir = $(datarootdir)' >> configparams && \
-		echo 'datadir = $(datadir)' >> configparams && \
-		echo 'infodir = $(infodir)' >> configparams && \
-		echo 'localedir = $(localedir)' >> configparams && \
-		echo 'mandir = $(mandir)' >> configparams && \
-		echo 'docdir = $(docdir)' >> configparams && \
-		echo 'rootsbindir = $(rootsbindir)' >> configparams && \
-		echo 'rtlddir = $(rtlddir)' >> configparams && \
-		echo 'slibdir = $(slibdir)' >> configparams && \
-		echo "install_root = $$(pwd)/../dest" >> configparams && \
 		if [ -n "$${TOOLS_PREFIX}" ]; then \
 			BINUTILS=--with-binutils=$${TOOLS_PREFIX}/bin; \
 		else \
 			BINUTILS=; \
 		fi && \
 		BUILD_CC=gcc BUILD_CXX=g++ ../src/libc/configure \
-			--prefix=/usr \
+			--prefix=$(prefix) \
 			--bindir=$(bindir) --sbindir=$(sbindir) \
 			--libexecdir=$(libexecdir) --sysconfdir=$(sysconfdir) \
 			--libdir=$(libdir) --includedir=$(includedir) \
@@ -113,7 +94,6 @@ eglibc.install.stamp: eglibc.build.stamp
 	cp ../ld.so.conf dest/etc
 	cp ../nsswitch.conf dest/etc
 	touch eglibc.install.stamp
-	bash
 
 	#mkdir localesbuild
 	#cd localesbuild && \
@@ -132,6 +112,7 @@ eglibc.install.stamp: eglibc.build.stamp
 	#		it_IT.UTF-8/UTF-8 it_IT/ISO-8859-1 \
 	#		ja_JP.EUC-JP/EUC-JP ja_JP.UTF-8/UTF-8' install-locales
 
+	# We're skipping the debug package for now...
 	#oh-strip -gl /usr/bin /usr/lib/*
 
 .SILENT: eglibc.stamp
--
cgit v0.9.1