CVS: src/si Configure,1.4,1.5 Makefile.in,1.14,1.15

Update of /cvsroot/lsb/src/si
In directory sc8-pr-cvs1:/tmp/cvs-serv27707

Modified Files:
	Configure Makefile.in 
Log Message:
Force rerunning Configure when certain files have changed
Configure remembers state in config.status so non-standard
locations will be offered as the default next time


Index: Configure
===================================================================
RCS file: /cvsroot/lsb/src/si/Configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Configure	15 Jan 2003 14:32:07 -0000	1.4
--- Configure	15 Jan 2003 15:26:28 -0000	1.5
***************
*** 1,26 ****
  #Makefile! /bin/sh
  
  if [ $# -gt 0 ]; then
! 	echo "Usage: ./configure"
  	exit 0
  fi
  
! echo -n "Where should the LSBsi be built [ /usr/src/si ] "
  read input
  if [ -z $input ]; then
! 	input=/usr/src/si
  fi
  build_dir=$input
  
! if [ -d $build_dir/lsbsi -o -d $build_dir/lsbsi-intermediate ]; then
! 	echo "Error: the build directory (${build_dir}) already has an lsbsi and/or "
! 	echo "lsbsi-intermediate in it, please remove them or choose a different path."
! 	exit -1
  fi
  
! echo -n "Where are the sources the LSBsi will be built from [ /usr/src/si/packages/ ] "
  read input
  if [ -z $input ]; then
! 	input=/usr/src/si/packages
  fi
  package_dir=$input
--- 1,34 ----
  #Makefile! /bin/sh
  
+ if [ -f config.status ] ; then
+ 	. config.status
+ else
+ 	build_dir=/usr/src/si
+ 	package_dir=/usr/src/si/packages
+ fi
+ 
  if [ $# -gt 0 ]; then
! 	echo "Usage: ./Configure"
  	exit 0
  fi
  
! echo -n "Where should the LSBsi be built [ $build_dir ] "
  read input
  if [ -z $input ]; then
! 	input=$build_dir
  fi
  build_dir=$input
  
! if [ -d $build_dir/lsbsi -o -d $build_dir/lsbsi-intermediate -o \
!      -d $build_dir/lsbsi-bootstrap ]; then
! 	echo "Warning: the build directory (${build_dir}) looks like it"
! 	echo "contains the results of a previous lsbsi build. Remember to clean"
! 	echo "it out before starting"
  fi
  
! echo -n "Where are the sources the LSBsi will be built from [ $package_dir ] "
  read input
  if [ -z $input ]; then
! 	input=$package_dir
  fi
  package_dir=$input
***************
*** 29,32 ****
--- 37,45 ----
  	exit -1
  fi
+ 
+ echo "build_dir=$build_dir" > config.status
+ echo "package_dir=$package_dir" >> config.status
+ echo "#lsbsiversion=`cat lsbsiversion`" >> config.status
+ echo "#`date`" >> config.status
  
  sed -e "s%@BUILDDIR@%$build_dir%g" \

Index: Makefile.in
===================================================================
RCS file: /cvsroot/lsb/src/si/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Makefile.in	15 Jan 2003 14:32:07 -0000	1.14
--- Makefile.in	15 Jan 2003 15:26:28 -0000	1.15
***************
*** 5,9 ****
  DATE=`date +"%m%d%Y"`
  
! all: lsbsi
  
  nalfs:
--- 5,12 ----
  DATE=`date +"%m%d%Y"`
  
! all: config.status lsbsi
! 
! config.status: lsbsiversion Makefile.in entities/general.in
! 	@echo "configuration missing or changed, run ./Configure" ; exit 1
  
  nalfs:
***************
*** 13,20 ****
  	fi
  
! build: nalfs
  	$(NALFS_DIR)/nALFS -i LSB.xml
  
! bootstrap: nalfs
  	@if [ ! -f bootstrap.stamp ]; then \
  		extras/entitycheck.py -q && \
--- 16,23 ----
  	fi
  
! build: config.status nalfs
  	$(NALFS_DIR)/nALFS -i LSB.xml
  
! bootstrap: config.status nalfs
  	@if [ ! -f bootstrap.stamp ]; then \
  		extras/entitycheck.py -q && \
***************
*** 23,27 ****
  	fi
  
! intermediate: bootstrap
  	@if [ ! -f phase2.stamp ]; then \
  		extras/entitycheck.py -q && \
--- 26,30 ----
  	fi
  
! intermediate: config.status bootstrap
  	@if [ ! -f phase2.stamp ]; then \
  		extras/entitycheck.py -q && \
***************
*** 30,34 ****
  	fi
  
! lsbsi: intermediate
  	@if [ ! -f phase3.stamp ]; then \
  		extras/entitycheck.py -q && \
--- 33,37 ----
  	fi
  
! lsbsi: config.status intermediate
  	@if [ ! -f phase3.stamp ]; then \
  		extras/entitycheck.py -q && \
***************
*** 37,41 ****
  	fi
  
! addons: lsbsi
  	@if [ ! -f phase4.stamp ]; then \
  		extras/entitycheck.py -q && \
--- 40,44 ----
  	fi
  
! addons: config.status lsbsi
  	@if [ ! -f phase4.stamp ]; then \
  		extras/entitycheck.py -q && \
***************
*** 64,66 ****
  
  update:
! 	cd packages;../extras/package_update.py ../docs/package_list
--- 67,69 ----
  
  update:
! 	extras/entitycheck.py -c -f