r736 - in x86/trunk/packages: LFS-BOOK LVM2 Xorg atk autoconf automake bash binutils bison

justin at linuxfromscratch.org justin at linuxfromscratch.org
Fri Sep 23 23:30:10 PDT 2005


Author: justin
Date: 2005-09-24 00:30:04 -0600 (Sat, 24 Sep 2005)
New Revision: 736

Modified:
   x86/trunk/packages/LFS-BOOK/Makefile
   x86/trunk/packages/LVM2/Makefile
   x86/trunk/packages/Xorg/Makefile
   x86/trunk/packages/atk/Makefile
   x86/trunk/packages/autoconf/Makefile
   x86/trunk/packages/automake/Makefile
   x86/trunk/packages/bash/Makefile
   x86/trunk/packages/binutils/Makefile
   x86/trunk/packages/bison/Makefile
Log:
Packages LFS-BOOK to bison - Messages/Logging update.

Modified: x86/trunk/packages/LFS-BOOK/Makefile
===================================================================
--- x86/trunk/packages/LFS-BOOK/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/LFS-BOOK/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # LFS Book Makefile
-#==============================================================================
 
 NM= LFS-BOOK
 VRS= trunk
@@ -8,29 +7,22 @@
 URL= svn://svn.linuxfromscratch.org/LFS/$(VRS)/BOOK
 
 # Targets
-# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) \
+	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@svn co -q $(URL) $(DIR)
-	@cd $(DIR)
-	@make BASEDIR=/usr/share/$(DIR) >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	svn co -q $(URL) $(DIR)
+	cd $(DIR)
+	make BASEDIR=/usr/share/$(DIR)
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/LVM2/Makefile
===================================================================
--- x86/trunk/packages/LVM2/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/LVM2/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # lvm2 Makefile
-#==============================================================================
 
 NM= LVM2
 VRS= 2.01.09
@@ -10,47 +9,22 @@
 SHA-$(FILE)= 8c0149e7f9bb8a785111b4d279be5a2bf9a44cd9
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) \
+	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile $(FILE)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	./configure --prefix=/usr
+	make $(PM)
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/Xorg/Makefile
===================================================================
--- x86/trunk/packages/Xorg/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/Xorg/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,7 +1,5 @@
 # Xorg Makefile
-#==============================================================================
 
-# Package versions
 NM= Xorg
 VRS= 6.8.2
 DIR= xc
@@ -19,69 +17,44 @@
 SHA-$(PATCH2)= 1b6fc0f487fa9e4546d364e850959c7e599f6b2b
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) \
+	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@patch -Np1 -i ../$(PATCH1)
-	@patch -Np1 -i ../$(PATCH2)
-	@sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile
-	@pushd config/util ; \
-	make -f Makefile.ini lndir >../$(DIR)-$@.log 2>&1 ; \
+	patch -Np1 -i ../$(PATCH1)
+	patch -Np1 -i ../$(PATCH2)
+	sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile
+	pushd config/util ; \
+	make -f Makefile.ini lndir ; \
 	cp lndir /usr/bin/ ; \
 	popd
-	@mkdir ../$(DIR)build
-	@cd ../$(DIR)build ; \
+	mkdir ../$(DIR)build
+	cd ../$(DIR)build ; \
 	lndir -silent ../$(DIR) ; \
 	cp ../host.def config/cf/host.def ; \
 	sed -i -e "s@#include <linux/config.h>@/* & */@" `grep -lr linux/config.h *`
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@cd ../$(DIR)build ; make $(PM) World >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@cd ../$(DIR)build ; make install >>../$(DIR)-$@.log 2>&1 ; \
-	 make install.man >>../$(DIR)-$@.log 2>&1
-	@ln -sf ../X11R6/bin /usr/bin/X11
-	@ln -sf ../X11R6/lib/X11 /usr/lib/X11
-	@ln -sf ../X11R6/include/X11 /usr/include/X11
-	@/sbin/ldconfig
-	@echo -e "#!/bin/sh\nexec /usr/X11R6/bin/X -nolisten tcp" >/etc/X11/xinit/xserverrc
-	@chmod 755 /etc/X11/xinit/xserverrc
-	@install -m644 $(ROOT)/etc/X11/xorg.conf /etc/X11/xorg.conf
-	@cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf
-	@fc-cache
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	cd ../$(DIR)build ; make $(PM) World
+	cd ../$(DIR)build ; make install ; \
+	make install.man
+	ln -sf ../X11R6/bin /usr/bin/X11
+	ln -sf ../X11R6/lib/X11 /usr/lib/X11
+	ln -sf ../X11R6/include/X11 /usr/include/X11
+	/sbin/ldconfig
+	echo -e "#!/bin/sh\nexec /usr/X11R6/bin/X -nolisten tcp" >/etc/X11/xinit/xserverrc
+	chmod 755 /etc/X11/xinit/xserverrc
+	install -m644 $(ROOT)/etc/X11/xorg.conf /etc/X11/xorg.conf
+	cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf
+	fc-cache
 
 clean:
-	@-rm -rf $(DIR)
-	@-rm -rf $(DIR)build
+	-rm -rf $(DIR)
+	-rm -rf $(DIR)build
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/atk/Makefile
===================================================================
--- x86/trunk/packages/atk/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/atk/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # ATK Makefile
-#==============================================================================
 
 NM= atk
 VRS= 1.9.1
@@ -10,47 +9,22 @@
 SHA-$(FILE)= ae8e2410f0fd5731a3b8fc902f0865f42103ffb9
 
 # Targets
-#==============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) \
+	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile $(FILE)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	./configure --prefix=/usr
+	make $(PM)
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/autoconf/Makefile
===================================================================
--- x86/trunk/packages/autoconf/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/autoconf/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # Autoconf Makefile
-#==============================================================================
 
 NM= autoconf
 VRS= 2.59
@@ -10,7 +9,6 @@
 SHA-$(FILE)= d366a07b2d99c95b7f24395aa8a8e023d8b93b69
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 

Modified: x86/trunk/packages/automake/Makefile
===================================================================
--- x86/trunk/packages/automake/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/automake/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # Automake Makefile
-#==============================================================================
 
 NM= automake
 VRS= 1.9.6
@@ -10,47 +9,22 @@
 SHA-$(FILE)= d205dbb274d3ff5be1cf6734f27fb452c7131866
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) \
+	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2: Makefile $(FILE) $(PATCH1)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	./configure --prefix=/usr
+	make $(PM)
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/bash/Makefile
===================================================================
--- x86/trunk/packages/bash/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/bash/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # Bash Makefile
-#==============================================================================
 
 NM= bash
 VRS= 3.0
@@ -22,90 +21,40 @@
 SHA-$(PATCH2)= f5dc122edaac230856d208a5787a3b346959a034
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 stage1: $(FILE) $(PATCH1)
-	@$(std_build)
-	@cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+	$(std_build)
+	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
 
 compile-stage1:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@patch -Np1 -i ../$(PATCH1)
-	@./configure --prefix=$(WD) --without-bash-malloc \
-	 >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-	@ln -s bash $(WD)/bin/sh
-#
-#==Status Messages==========================================
-#
-	@$(OK)
+	patch -Np1 -i ../$(PATCH1)
+	./configure --prefix=$(WD) --without-bash-malloc
+	make
+	make install
+	ln -s bash $(WD)/bin/sh
 
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) \
+	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2: Makefile $(FILE) $(FILE1) $(PATCH1) $(PATCH2)
-	@$(std_build)
-	@cp $(SRC)/{$(PATCH2),$(FILE1)} $(LFSSRC)/
+	$(std_build)
+	cp $(SRC)/{$(PATCH2),$(FILE1)} $(LFSSRC)/
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@unpack ../$(FILE1)
-	@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 \
-	 --with-installed-readline >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	unpack ../$(FILE1)
+	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 \
+	 --with-installed-readline
+	make $(PM)
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: compile-stage1 clean chroot compile-stage2

Modified: x86/trunk/packages/binutils/Makefile
===================================================================
--- x86/trunk/packages/binutils/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/binutils/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # Binutils Makefile
-#==============================================================================
 
 NM= binutils
 VRS= 2.16.1
@@ -9,7 +8,6 @@
 SHA-$(FILE)= 5c80fd5657da47efc16a63fdd93ef7395319fbbf
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
@@ -20,36 +18,20 @@
 endif
 
 pass1: $(FILE)
-	@$(sep_dir_build)
-	@cp $(SRC)/$(FILE) $(LFSSRC)
+	$(sep_dir_build_noclean)
+	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-pass1:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@$(call echo_message, Configuring)
-	@../$(DIR)/configure --prefix=$(WD) --disable-nls >../$(DIR)-$@.log \
-	2>&1
-	@$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@$(call echo_message, Making)
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-	@$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@$(call echo_message, Installing)
-	@make install >>../$(DIR)-$@.log 2>&1
-	@make -C ld clean >>../$(DIR)-$@.log 2>&1
-	@make -C ld LIB_PATH=$(WD)/lib >>../$(DIR)-$@.log 2>&1
-	@$(OK)
+	../$(DIR)/configure --prefix=$(WD) --disable-nls
+	make $(PM)
+	make install
+	make -C ld clean
+	make -C ld LIB_PATH=$(WD)/lib
 
 adjust-toolchain:
-	@echo 'main(){}' > dummy.c && cc dummy.c && \
+	echo 'main(){}' > dummy.c && cc dummy.c && \
 	 readelf -l a.out > .specstest
-	@if ! cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
+	if ! cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
 	 make -C ld install && \
 	 SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
 	 gcc -dumpspecs > $$SPECFILE && \
@@ -60,81 +42,50 @@
 	 rm -f `grep -l "DO NOT EDIT THIS FILE" $${GCC_INCLUDEDIR}/*` && \
 	 unset GCC_INCLUDEDIR && \
 	 cd .. && make clean ; fi
-	@touch $@
+	touch $@
 
 pass2: $(FILE)
-	@$(sep_dir_build)
+	$(sep_dir_build_noclean)
 
 compile-pass2:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@$(call echo_message, Configuring)
-	@../$(DIR)/configure --prefix=$(WD) --disable-nls \
-	 --enable-shared --with-lib-path=$(WD)/lib >../$(DIR)-$@.log 2>&1
-	@$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@$(call echo_message, Making)
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-	@$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@$(call echo_message, Installing)
-	@make install >>../$(DIR)-$@.log 2>&1
-	@make -C ld clean >>../$(DIR)-$@.log 2>&1
-	@make -C ld LIB_PATH=/usr/lib:/lib >>../$(DIR)-$@.log 2>&1
-	@$(OK)
+	../$(DIR)/configure --prefix=$(WD) --disable-nls \
+	 --enable-shared --with-lib-path=$(WD)/lib
+	make $(PM)
+	make install
+	make -C ld clean
+	make -C ld LIB_PATH=/usr/lib:/lib
 
 chroot-re-adjust-toolchain:
-	@chroot "$(MP)" $(chenv-pre-bash) \
+	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-re-adjust-toolchain $(chbash-pre-bash)'
 
 re-adjust-toolchain:
-	@echo 'main(){}' > dummy.c && cc dummy.c && \
+	echo 'main(){}' > dummy.c && cc dummy.c && \
 	 readelf -l a.out > .specstest
-	@if cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
+	if cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
 	 make -C ld INSTALL=$(WD)/bin/install install && \
 	 SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
 	 gcc -dumpspecs > $$SPECFILE && \
 	 sed -i 's@^$(WD)/lib/$(LINKER)@/lib/$(LINKER)@g' $$SPECFILE && \
 	 unset SPECFILE ; fi
-	@make clean
-	@touch $@
+	make clean
+	touch $@
 
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) \
+	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2: $(FILE)
-	@$(sep_dir_build)
+	$(sep_dir_build)
 
 compile-stage2:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@$(call echo_message, Configuring)
-	@../$(DIR)/configure --prefix=/usr --enable-shared >../$(DIR)-$@.log \
-	 2>&1
-	@$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@$(call echo_message, Making)
-	@make $(PM) tooldir=/usr >>../$(DIR)-$@.log 2>&1
-	@$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@$(call echo_message, Installing)
-	@make tooldir=/usr install >>../$(DIR)-$@.log 2>&1
-	@cp ../$(DIR)/include/libiberty.h /usr/include
-	@$(OK)
+	../$(DIR)/configure --prefix=/usr --enable-shared
+	make $(PM) tooldir=/usr
+	make tooldir=/usr install
+	cp ../$(DIR)/include/libiberty.h /usr/include
 
 clean:
-	@-rm -rf $(DIR)
-	@-rm -rf $(NM)-build
+	-rm -rf $(DIR)
+	-rm -rf $(NM)-build
 
 .PHONY: compile-pass1 clean chroot compile-pass2 compile-stage2

Modified: x86/trunk/packages/bison/Makefile
===================================================================
--- x86/trunk/packages/bison/Makefile	2005-09-24 04:46:55 UTC (rev 735)
+++ x86/trunk/packages/bison/Makefile	2005-09-24 06:30:04 UTC (rev 736)
@@ -1,5 +1,4 @@
 # Bison Makefile
-#==============================================================================
 
 NM= bison
 VRS= 2.0
@@ -10,47 +9,22 @@
 SHA-$(FILE)= fe1cafed51b9da77eb8253ad6cae6a880ca8ec7f
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) \
+	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2: Makefile $(FILE)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	./configure --prefix=/usr
+	make $(PM)
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2




More information about the livecd mailing list