* bootstrap.sh: Always reconfigure in libgetopt++.

* Makefile.am: Remove old code for direct copying to sourceware.  Add -src to
source tarball.

diff --git a/ChangeLog b/ChangeLog
index cd60130504512edd8b32406645b24a2ef7548134..003e1e8da8d53688f238c93654e940389252edd1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-08  Christopher Faylor  <me+cygwin@cgf.cx>
+
+       * bootstrap.sh: Always reconfigure in libgetopt++.
+
+       * Makefile.am: Remove old code for direct copying to sourceware.  Add
+       -src to source tarball.
+
 2010-04-07  Matthias Andree  <matthias.andree@gmx.de>
 
        * README (HOW TO BUILD): Mention mingw-lib{gcrypt,lzma}-devel.

diff --git a/Makefile.am b/Makefile.am
index cdcabe0b970aa3a5244ed7a32022d6fd6eae693b..621cfc89da47c92b9ca9ac52d84e148a8ed7101b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,6 @@
 #     A copy of the GNU General Public License can be found at
 #     http://www.gnu.org/
 #
-# Written by Christopher Faylor <cgf@redhat.com>
-# and Robert Collins  <rbtcollins@hotmail.com>
-#
 # Makefile for Cygwin installer
 
 INST_SUBDIRS:=@subdirs@
@@ -299,23 +296,6 @@ setup_version.c : $(srcdir)/ChangeLog Makefile
 .rc.o:
        $(WINDRES) --include-dir $(srcdir) -o $@ $<
 
-# this target creates:
-#   setup-x.yyy.exe             (UPXed stripped exe)
-#   setup-debug-x.yyy.exe.gz    (gzipped unstripped exe)
-#   setup-x.yyy.tar.bz2         (source)
-release: setup.exe $(srcdir)/ChangeLog Makefile
-       $(MAKE) dist-bzip2 distdir=setup-${VER}
-       cp -pf setup.exe setup-debug-${VER}.exe
-       gzip -f9 setup-debug-${VER}.exe
-       cp -pf setup.exe setup-${VER}.exe
-       $(STRIP) setup-${VER}.exe
-       upx --best setup-${VER}.exe
-
-# Create a snapshot and upload it (requires write access)
-snapshot: release
-       scp -C setup-${VER}.exe setup-debug-${VER}.exe.gz setup-${VER}.tar.bz2 \
-           $${cygwinsite:-cygwin.com}:setup-snapshots/
-
 # static const char version_store[] = VERSION_PREFIX " 2.686";
 setup-src:
        @ver=setup-$$(sed -n 's/^static const char version_store.* VERSION_PREFIX " \([^"]*\)".*$$/\1/p' setup_version.c);\
@@ -323,8 +303,8 @@ setup-src:
        rm -f $$ver;\
        ln -sf . $$ver;\
        cvs status -R | sed -n "s%^ *Repository revision:.*/cvs/cygwin-apps/setup/\(.*\),v%$$ver/\1%p" |\
-       sort | tar -T - -cjf ${CURDIR}/$$ver.tar.bz2;\
-       echo $$ver.tar.bz2
+       sort | tar -T - -cjf ${CURDIR}/$$ver-src.tar.bz2;\
+       echo $$ver-src.tar.bz2; exec rm -f $$ver
 
 .PHONY: ${INST_SUBDIRS}
 ${INST_SUBDIRS}:

diff --git a/bootstrap.sh b/bootstrap.sh
index e074507f8b002882e7f960671aa60ca1f0a9c639..cf35ebad035713f1d2774bb9118cf5d7d921fcc0 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -22,15 +22,6 @@ if [ ! -f cygpackage.cc ]; then
   exit 1
 fi
 
-# Run bootstrap in required subdirs, iff it has not yet been run
-if [ ! -f libgetopt++/configure ]; then
-  echo "Running bootstrap.sh in libgetopt++"
-  (
-    cd libgetopt++
-    ./bootstrap.sh
-  )
-  echo "Continuing with bootstrap in current directory"
-fi
 
 # Make sure cfgaux exists
 mkdir -p cfgaux
@@ -42,4 +33,8 @@ bootstrap libtoolize --automake
 bootstrap autoconf
 bootstrap automake --foreign --add-missing
 
+# Run bootstrap in required subdirs, iff it has not yet been run
+echo "bootstrapping in libgetopt++"
+cd libgetopt++; ./bootstrap.sh
+
 echo "Autotool bootstrapping complete."