r720 - x86/trunk/packages/bash

justin at linuxfromscratch.org justin at linuxfromscratch.org
Thu Sep 22 23:25:09 PDT 2005


Author: justin
Date: 2005-09-23 00:25:08 -0600 (Fri, 23 Sep 2005)
New Revision: 720

Modified:
   x86/trunk/packages/bash/Makefile
Log:
Added bash-doc to bash Makefile.

Modified: x86/trunk/packages/bash/Makefile
===================================================================
--- x86/trunk/packages/bash/Makefile	2005-09-23 05:59:34 UTC (rev 719)
+++ x86/trunk/packages/bash/Makefile	2005-09-23 06:25:08 UTC (rev 720)
@@ -9,6 +9,10 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= eaa39bae5dccf44a48593858009fb3dc01d4346a
 
+FILE1 = $(NM)-doc-$(VRS).tar.bz2
+URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
+SHA-$(FILE1)= ffb7d4920becfc0acc5a4068ab5b5f09300733cf
+
 PATCH1= $(DIR)-avoid_WCONTINUED-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 3ea7cf640d5bcf5e442654986e53e6a796ba996e
@@ -62,15 +66,18 @@
 	@chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE) $(FILE1) $(PATCH1) $(PATCH2)
 	@$(std_build)
-	@cp $(SRC)/$(PATCH2) $(LFSSRC)/
+	@cp $(SRC)/{$(PATCH2),$(FILE1)} $(LFSSRC)/
 
 compile-stage2:
 	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+	@tar -xf ../bash-doc-3.0.tar.bz2
+	@sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.0|" \
+         Makefile.in
 	@patch -Np1 -i ../$(PATCH1)
 	@patch -Np1 -i ../$(PATCH2)
 	@./configure --prefix=/usr --bindir=/bin --without-bash-malloc \




More information about the livecd mailing list