summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HACKING4
-rw-r--r--configure.ac (renamed from configure.in)0
2 files changed, 2 insertions, 2 deletions
diff --git a/HACKING b/HACKING
index 4a561f2b..7a5a792c 100644
--- a/HACKING
+++ b/HACKING
@@ -172,14 +172,14 @@ To make a release of D-Bus, do the following:
then simply created an unsigned annotated tag:
"git tag -a -m 'Released X.Y.Z' dbus-X.Y.Z".
- - bump the version number up in configure.in (so the micro version is odd),
+ - bump the version number up in configure.ac (so the micro version is odd),
and commit it. Make sure you do this *after* tagging the previous
release! The idea is that git has a newer version number
than anything released.
- merge the branch you've released to the chronologically-later
branch (usually "master"). You'll probably have to fix a merge
- conflict in configure.in (the version number).
+ conflict in configure.ac (the version number).
- push your changes and the tag to the central repository with
git push origin master dbus-X.Y dbus-X.Y.Z
diff --git a/configure.in b/configure.ac
index b043018f..b043018f 100644
--- a/configure.in
+++ b/configure.ac