CVS: src/si Configure,1.7,1.8 Makefile.in,1.18,1.19

Mats Wichmann <[email protected]> Fri, 25 Apr 2003 09:30:52 -0700
Newsgroups gmane.linux.lsb.implementation
Message-ID <[email protected]>
Update of /cvsroot/lsb/src/si
In directory sc8-pr-cvs1:/tmp/cvs-serv24763

Modified Files:
	Configure Makefile.in 
Log Message:
Add localization of entitycheck
Fill in some older bits in Makefile.in


Index: Configure
===================================================================
RCS file: /cvsroot/lsb/src/si/Configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Configure	11 Feb 2003 19:05:33 -0000	1.7
--- Configure	25 Apr 2003 16:30:15 -0000	1.8
***************
*** 6,9 ****
--- 6,10 ----
  	build_dir=/usr/src/si
  	package_dir=/usr/src/si/packages
+         fallback_url='http://freestandards.org/pub/lsb/impl/packages'
  fi
  
***************
*** 38,43 ****
--- 39,52 ----
  fi
  
+ echo -n "Where is a backup location for fetching packages [ $fallback_url ] "
+ read input
+ if [ -z $input ]; then
+ 	input=$fallback_url
+ fi
+ fallback_url=$input
+ 
  echo "build_dir=$build_dir" > config.status
  echo "package_dir=$package_dir" >> config.status
+ echo "fallback_url=$fallback_url" >> config.status
  echo "#lsbsiversion=`cat lsbsiversion`" >> config.status
  echo "#umlsirelease=`cat rpm/release`" >> config.status
***************
*** 48,51 ****
--- 57,66 ----
      -e "s%@LSBSIVERSION@%`cat lsbsiversion`%g" \
  	entities/general.in > entities/general
+ 
+ sed -e "s%@BUILDDIR@%$build_dir%g" \
+     -e "s%@PACKAGEDIR@%$package_dir%g" \
+     -e "s%@FALLBACKURL@%$fallback_url%g" \
+     -e "s%@LSBSIVERSION@%`cat lsbsiversion`%g" \
+ 	extras/entitypath.py.in > extras/entitypath.py
  
  sed -e "s%@BUILDDIR@%$build_dir%g" \

Index: Makefile.in
===================================================================
RCS file: /cvsroot/lsb/src/si/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** Makefile.in	29 Jan 2003 02:47:28 -0000	1.18
--- Makefile.in	25 Apr 2003 16:30:16 -0000	1.19
***************
*** 7,11 ****
  all: config.status lsbsi
  
! config.status: lsbsiversion Makefile.in entities/general.in
  	@echo "configuration missing or changed, run ./Configure" ; exit 1
  
--- 7,12 ----
  all: config.status lsbsi
  
! config.status: lsbsiversion Makefile.in entities/general.in \
! 	extras/entitypath.py rpm/Makefile rpm/umlsi.spec rpm/rpmrc
  	@echo "configuration missing or changed, run ./Configure" ; exit 1
  
***************
*** 52,55 ****
--- 53,58 ----
  distclean:
  	@rm -f entities/general Makefile bootstrap.stamp \
+ 		extras/entitypath.py extras/entitypath.pyc \
+ 		rpm/Makefile rpm/umlsi.spec rpm/rpmrc \
  		phase2.stamp phase3.stamp phase4.stamp nalfs.stamp