cvs commit: ALFS/nALFS bootstrap.doc bootstrap bootstrap.Makefile bootstrap.configure bootstrap.libtool

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Thu Nov 6 18:23:09 PST 2003


kpfleming    03/11/06 19:23:09

  Modified:    nALFS    bootstrap bootstrap.Makefile bootstrap.configure
                        bootstrap.libtool
  Added:       nALFS    bootstrap.doc
  Log:
  don't try to apply libtool patch if it's already there (CVS libtool includes a version of this patch)
  add support for including files from the doc directory in the tarball, and installing them into $prefix/share/nALFS at installation time
  
  Revision  Changes    Path
  1.17      +2 -0      ALFS/nALFS/bootstrap
  
  Index: bootstrap
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/bootstrap,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- bootstrap	4 Nov 2003 19:42:51 -0000	1.16
  +++ bootstrap	7 Nov 2003 02:23:08 -0000	1.17
  @@ -38,6 +38,8 @@
   
   . ./bootstrap.Makefile > Makefile.am
   
  +. ./bootstrap.doc > doc/Makefile.am
  +
   . ./bootstrap.configure > configure.ac
   
   autoreconf --install --force
  
  
  
  1.8       +1 -0      ALFS/nALFS/bootstrap.Makefile
  
  Index: bootstrap.Makefile
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/bootstrap.Makefile,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- bootstrap.Makefile	6 Nov 2003 23:17:23 -0000	1.7
  +++ bootstrap.Makefile	7 Nov 2003 02:23:08 -0000	1.8
  @@ -1,5 +1,6 @@
   #!/bin/bash
   cat <<"EOF"
  +SUBDIRS = doc
   ACLOCAL_FLAGS=-I m4
   EXTRA_DIST = CHANGES COPYING README CREDITS
   EXTRA_DIST += scripts/flog
  
  
  
  1.7       +1 -1      ALFS/nALFS/bootstrap.configure
  
  Index: bootstrap.configure
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/bootstrap.configure,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- bootstrap.configure	4 Nov 2003 18:04:13 -0000	1.6
  +++ bootstrap.configure	7 Nov 2003 02:23:08 -0000	1.7
  @@ -192,7 +192,7 @@
      fi
   fi
   
  -AC_CONFIG_FILES([Makefile])
  +AC_CONFIG_FILES([Makefile doc/Makefile])
   EOF
   
   default_syntaxes=`echo ${all_syntaxes} | tr -s '[:blank:]' ',' | tr '_' '.'`
  
  
  
  1.3       +4 -0      ALFS/nALFS/bootstrap.libtool
  
  Index: bootstrap.libtool
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/bootstrap.libtool,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bootstrap.libtool	28 Oct 2003 02:11:48 -0000	1.2
  +++ bootstrap.libtool	7 Nov 2003 02:23:08 -0000	1.3
  @@ -1,3 +1,7 @@
  +#!/bin/bash
  +
  +grep -q preserve_args gnubuild/ltmain.sh && exit 0
  +
   # libtool supports a --silent argument, but does not pass it to
   # itself when it is reinvoked at the end of --mode=install processing
   # this patch corrects that behavior to keep the "noise" down
  
  
  
  1.1                  ALFS/nALFS/bootstrap.doc
  
  Index: bootstrap.doc
  ===================================================================
  #!/bin/bash
  cat <<EOF
  nobase_dist_pkgdata_DATA = nALFSrc
  EOF
  
  pushd doc > /dev/null
  for file in `find . -name \*.dtd -print`; do
  	echo nobase_dist_pkgdata_DATA += ${file}
  done
  
  for file in `find . -name \*.txt -print`; do
  	echo nobase_dist_pkgdata_DATA += ${file}
  done
  
  for file in `find . -name \*.html -print`; do
  	echo nobase_dist_pkgdata_DATA += ${file}
  done
  popd > /dev/null
  
  
  



More information about the alfs-log mailing list