diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-09-17 12:00:39 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-09-17 12:00:39 +0200 |
| commit | 27d06b631ca93d1fb9fc3a21013c8fd096270d9c (patch) | |
| tree | 226f8890bbb8d2cbe12fef42e78317fbef23ea2e /HACKING | |
| parent | 452bfacee9fd543eb87d1bddd4af106142e12778 (diff) | |
| parent | e09f00c8aada78d19c199bb6f7743330dc086afa (diff) | |
| download | automake-27d06b631ca93d1fb9fc3a21013c8fd096270d9c.tar.gz | |
Merge branch 'maint'
Diffstat (limited to 'HACKING')
| -rw-r--r-- | HACKING | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -33,16 +33,16 @@ Most of them are updated before release with `make fetch'. * Changes other than bug fixes must be mentioned in NEWS. Important - bug fixes should be mentioned in NES, too. + bug fixes should be mentioned in NEWS, too. ================================================================ = Naming * We've adopted the convention that internal AC_SUBSTs should be - named with a leading `am__', and internally generated targets should - be named with a leading `am--'. This convention is very new - (as of Feb 7 2001) and so it isn't yet universally used. But all - new code should use it. + named with a leading `am__', and internally generated targets + should be named with a leading `am--'. This convention, although + in place from at least February 2001, isn't yet universally used. + But all new code should use it. We used to use `_am_' as the prefix for an internal AC_SUBST. However, it turns out that NEWS-OS 4.2R complains if a Makefile @@ -98,8 +98,8 @@ not installed as "autoconf", pass it explicitly (along with the accompanying "autom4te") when calling `bootstrap' and `configure'. For example: - $ AUTOCONF=autoconf2.65 AUTOM4TE=autom4te2.65 ./bootstrap - $ ./configure AUTOCONF=autoconf2.65 AUTOM4TE=autom4te2.65 + $ AUTOCONF=autoconf2.67 AUTOM4TE=autom4te2.67 ./bootstrap + $ ./configure AUTOCONF=autoconf2.67 AUTOM4TE=autom4te2.67 * Dependent files aclocal.m4, configure and Makefile.in in all directories should be up to date in the git repository, so that @@ -143,6 +143,8 @@ the active branches descending from the buggy commit. This offers a simple way to fix the bug consistently and effectively. +* When referring to older commits, use 'git describe' output as pointer. + * There may be a number of longer-lived feature branches for new developments. They should be based off of a common ancestor of all active branches to which the feature should be merged later. The next branch may serve as |