r3037 - in jhalfs/branches/experimental: . BLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Aug 22 11:56:11 PDT 2006


Author: manuel
Date: 2006-08-22 12:56:08 -0600 (Tue, 22 Aug 2006)
New Revision: 3037

Modified:
   jhalfs/branches/experimental/BLFS/Makefile
   jhalfs/branches/experimental/BLFS/gen_config.sh
   jhalfs/branches/experimental/BLFS/update_book.sh
   jhalfs/branches/experimental/blfs
Log:
Trying to define work flow.

Modified: jhalfs/branches/experimental/BLFS/Makefile
===================================================================
--- jhalfs/branches/experimental/BLFS/Makefile	2006-08-22 18:36:50 UTC (rev 3036)
+++ jhalfs/branches/experimental/BLFS/Makefile	2006-08-22 18:56:08 UTC (rev 3037)
@@ -3,7 +3,7 @@
 # Additional changes: George Boudreau <georgeb at linuxfromscratch.org>
 
 TOPDIR=$(shell pwd)
-CONFIG_CONFIG_IN = aConfig.in
+CONFIG_CONFIG_IN = Config.in
 CONFIG = menu
 
 all: 	menuconfig
@@ -15,9 +15,10 @@
 	$(MAKE) -C $(CONFIG) ncurses conf mconf
 
 menuconfig: $(CONFIG)/mconf
-	./gen_config.sh
+	@./update_book.sh none
+	@./gen_config.sh
 	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
-	./gen_pkg_book.sh
+	@./gen_pkg_book.sh
 
 config: $(CONFIG)/conf
 	@$(CONFIG)/conf $(CONFIG_CONFIG_IN)

Modified: jhalfs/branches/experimental/BLFS/gen_config.sh
===================================================================
--- jhalfs/branches/experimental/BLFS/gen_config.sh	2006-08-22 18:36:50 UTC (rev 3036)
+++ jhalfs/branches/experimental/BLFS/gen_config.sh	2006-08-22 18:56:08 UTC (rev 3037)
@@ -3,7 +3,7 @@
 # $Id:
 #
 
-export outFile=aConfig.in	# file for reading and writing to.
+export outFile=Config.in	# file for reading and writing to.
 export inFile=packages		# file for reading and writing to.
 
 declare PKG_NAME

Modified: jhalfs/branches/experimental/BLFS/update_book.sh
===================================================================
--- jhalfs/branches/experimental/BLFS/update_book.sh	2006-08-22 18:36:50 UTC (rev 3036)
+++ jhalfs/branches/experimental/BLFS/update_book.sh	2006-08-22 18:56:08 UTC (rev 3037)
@@ -72,35 +72,37 @@
 
 [ "${DOC_MODE}" != "none" ] && BOOK_Source
 
-echo -en "\n\tGenerating packages database file ..."
-generate_packages
-echo "done."
+if [ "${DOC_MODE}" = "none" ] ; then
+  echo -en "\n\tGenerating packages database file ..."
+  generate_packages
+  echo "done."
 
-echo -en "\tGenerating alsa dependencies list ..."
-generate_alsa
-echo "done."
+  echo -en "\tGenerating alsa dependencies list ..."
+  generate_alsa
+  echo "done."
 
-echo -en "\tGenerating gnome-core dependencies list ..."
-generate_gnome_core
-echo "done."
+  echo -en "\tGenerating gnome-core dependencies list ..."
+  generate_gnome_core
+  echo "done."
 
-echo -en "\tGenerating gnome-full dependencies list ..."
-generate_gnome_full
-echo "done."
+  echo -en "\tGenerating gnome-full dependencies list ..."
+  generate_gnome_full
+  echo "done."
 
-echo -en "\tGenerating kde-core dependencies list ..."
-generate_kde_core
-echo "done."
+  echo -en "\tGenerating kde-core dependencies list ..."
+  generate_kde_core
+  echo "done."
 
-echo -en "\tGenerating kde-full dependencies list ..."
-generate_kde_full
-echo -e "done."
+  echo -en "\tGenerating kde-full dependencies list ..."
+  generate_kde_full
+  echo -e "done."
 
-echo -en "\tGenerating kde-koffice dependencies list ..."
-generate_kde_koffice
-echo -e "done."
+  echo -en "\tGenerating kde-koffice dependencies list ..."
+  generate_kde_koffice
+  echo -e "done."
 
-echo -en "\tGenerating xorg7 dependencies list ..."
-generate_xorg7
-echo "done."
+  echo -en "\tGenerating xorg7 dependencies list ..."
+  generate_xorg7
+  echo "done."
+fi
 

Modified: jhalfs/branches/experimental/blfs
===================================================================
--- jhalfs/branches/experimental/blfs	2006-08-22 18:36:50 UTC (rev 3036)
+++ jhalfs/branches/experimental/blfs	2006-08-22 18:56:08 UTC (rev 3037)
@@ -135,7 +135,6 @@
   ./update_book.sh get $BLFS_XML $TREE
 fi
 
-# Generate Config.in and run the menuconfig interface
- ./gen_config.sh
-# make
+# Run the menuconfig interface
+make
 




More information about the alfs-log mailing list