diff options
| author | Peter Simons <simons@cryp.to> | 2009-07-24 23:37:39 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2009-07-24 23:40:58 +0200 |
| commit | 5c040b86a86f3c35b4d8b7ae80b0dc66f3b7e884 (patch) | |
| tree | 06b0f6451c4080aeff50434b32d25f0d11037463 | |
| parent | 1175b7008982c425cd73d58044581e42f4533610 (diff) | |
| download | autoconf-archive-5c040b86a86f3c35b4d8b7ae80b0dc66f3b7e884.tar.gz | |
gnulib: deleted submodule
The announce-gen script needs access to the gnulib repository in order
to determine the library's version string. The default location, where
gnulib is expected to be, is $srcdir/gnulib. Quoting from maint.mk:
gnulib_dir ?= $(srcdir)/gnulib
gnulib-version = $$(cd $(gnulib_dir) && git describe)
At first, it looked like adding gnulib as a submodule to that location
would be a good idea (especially, since it's needed to bootstrap, too).
After some thought, however, it feels like overkill. Submodules are
meant to track the state of the other repository in the current branch,
but we don't really need that information. We just need some moderately
recent version of gnulib-tool somewhere in $PATH; that's good enough.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | bootstrap.sh | 10 | ||||
| m--------- | gnulib | 0 |
4 files changed, 10 insertions, 5 deletions
@@ -22,3 +22,4 @@ /config.status /configure /maint.mk +/gnulib diff --git a/.gitmodules b/.gitmodules index f02810f..f9fcfd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,3 @@ [submodule "m4"] path = m4 url = ssh://git.sv.gnu.org/srv/git/autoconf-archive.git - -[submodule "gnulib"] - path = gnulib - url = git://git.savannah.gnu.org/gnulib.git diff --git a/bootstrap.sh b/bootstrap.sh index 83e5abb..6f25ade 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -2,7 +2,15 @@ set -eu -gnulib/gnulib-tool --m4-base build-aux --source-base build-aux --import git-version-gen gitlog-to-changelog gnupload maintainer-makefile announce-gen +if [ -x "gnulib/gnulib-tool" ]; then + gnulibtool=gnulib/gnulib-tool +else + gnulibtool=gnulib-tool +fi +$gnulibtool --m4-base build-aux --source-base build-aux --import git-version-gen gitlog-to-changelog gnupload maintainer-makefile announce-gen + echo TODO >AUTHORS + (cd m4 && ../build-aux/gitlog-to-changelog -- master >../ChangeLog) + autoreconf --install -Wall diff --git a/gnulib b/gnulib deleted file mode 160000 -Subproject 2d8b95d62cc4d6524fa6c4dbc3138d88a583915 |