Author: justin
Date: 2005-11-17 17:51:20 -0700 (Thu, 17 Nov 2005)
New Revision: 1092
Modified:
branches/6.1.1-1/packages/bash/Makefile
Log:
Fixed errors from last commit to bash Makefile.
Modified: branches/6.1.1-1/packages/bash/Makefile
===================================================================
--- branches/6.1.1-1/packages/bash/Makefile 2005-11-17 22:59:59 UTC (rev
1091)
+++ branches/6.1.1-1/packages/bash/Makefile 2005-11-18 00:51:20 UTC (rev
1092)
@@ -42,20 +42,19 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(FILE2) ] ; then $(WGET) $(URL3) && \
+ mv $(FILE2) $(SRC) ; fi
@if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
mv $(PATCH1) $(SRC) ; fi
@if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
mv $(PATCH2) $(SRC) ; fi
- @if [ ! -f $(SRC)/$(FILE2) ] ; then $(WGET) $(URL3) && \
- mv $(FILE2) $(SRC) ; fi
@if [ ! -f /bin/bashbug ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
- tar -xfv $(SRC)/$(FILE2) && \
- sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.0|" && \
+ tar -xf $(SRC)/$(FILE2) && \
+ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.0|"
Makefile.in && \
patch -Np1 -i $(SRC)/$(PATCH2) && patch -Np1 -i $(SRC)/$(PATCH1) && \
./configure --prefix=/usr --bindir=/bin --without-bash-malloc
--with-installed-readline && \
make && rm /bin/bash && make install ; fi
@make clean
-
clean:
@-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
