Skip to content

Commit

Permalink
Do not distribute a copy of gitlog-to-changelog.
Browse files Browse the repository at this point in the history
* Makefile.am (GITLOG_TO_CHANGELOG): New.
(gen-ChangeLog): Require an installed gitlog-to-changelog.
* scripts/gitlog-to-changelog: Remove.

* README.SVN: Remove.
* REMOVE.GIT: New.
  • Loading branch information
dd9jn committed Nov 5, 2012
1 parent 4f6fb15 commit 40976d7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 358 deletions.
10 changes: 6 additions & 4 deletions Makefile.am
Expand Up @@ -22,14 +22,16 @@ AUTOMAKE_OPTIONS = dist-bzip2
DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon \
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia

# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
GITLOG_TO_CHANGELOG=gitlog-to-changelog

DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
SUBDIRS = compat mpi cipher random src doc tests
EXTRA_DIST = autogen.sh README.SVN \
EXTRA_DIST = autogen.sh README.GIT \
ChangeLog-2011 scripts/ChangeLog-2011 doc/ChangeLog-2011 \
m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \
random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
scripts/gitlog-to-changelog scripts/git-log-footer \
scripts/git-log-fix
scripts/git-log-footer scripts/git-log-fix

DISTCLEANFILES =

Expand All @@ -56,7 +58,7 @@ gen_start_date = 2011-12-01T14:00:00
gen-ChangeLog:
if test -d $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \
./scripts/gitlog-to-changelog \
$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
--amend=scripts/git-log-fix \
--since=$(gen_start_date) ) > $(distdir)/cl-t; \
cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t; \
Expand Down
16 changes: 7 additions & 9 deletions README.SVN → README.GIT
@@ -1,9 +1,11 @@
If you are building from CVS, run the script
If you are building from GIT, run the script

./autogen.sh

first, to make sure that you have all the necessary maintainer tools
are installed and to build the actual configuration files. Then run
are installed and to build the actual configuration files. If you
have just checked out from GIT, you should add the option "--force" to
autogen.sh so that meta data is noticed by autom4te.cache. Then run

./configure --enable-maintainer-mode

Expand All @@ -14,7 +16,7 @@ tools, or the tools are not installed, you may use environment
variables to override the default tool names:

AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake
package. For example
package. For example
AUTOMAKE_SUFFIX="-1.7" ./autogen.sh
uses "automake-1.7" and "aclocal-1.7.
AUTOMAKE_PREFIX is used as a prefix for all tools from the automake
Expand All @@ -35,17 +37,13 @@ It is also possible to use the variable name AUTOMAKE, AUTOCONF,
ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name
of the programs to run. It is however better to use the suffix and
prefix forms as described above because that does not require
knowledge about the actual tools used by autgen.sh.
knowledge about the actual tools used by autogen.sh.


Please don't use autopoint, libtoolize or autoreconf unless you are
the current maintainer and want to update the standard configuration
files. All those files should be in the CVS and only updated manually
files. All those files should be in GIT and only updated manually
if the maintainer decides that newer versions are required. The
maintainer should also make sure that the required version of automake
et al. are properly indicated at the top of configure.ac and take care
to copy the files and not merely use symlinks.




0 comments on commit 40976d7

Please sign in to comment.