summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildlib/configure.mak4
-rw-r--r--configure.ac (renamed from configure.in)4
-rwxr-xr-xdebian/rules2
-rwxr-xr-xprepare-release2
4 files changed, 6 insertions, 6 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 68d0535b4..7052e4c56 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -2,7 +2,7 @@
# This make fragment is included by the toplevel make to handle configure
# and setup. It defines a target called startup that when run will init
-# the build directory, generate configure from configure.in, create aclocal
+# the build directory, generate configure from configure.ac, create aclocal
# and has rules to run config.status should one of the .in files change.
# Input
@@ -48,7 +48,7 @@ missing-config-files:
@echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
exit 100
-configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
+configure: aclocal.m4 configure.ac buildlib/config.guess buildlib/config.sub
autoconf
aclocal.m4: $(wildcard buildlib/*.m4)
diff --git a/configure.in b/configure.ac
index 4c25ba5d4..129be5c12 100644
--- a/configure.in
+++ b/configure.ac
@@ -10,10 +10,10 @@ dnl need a C++ compiler that is semi-standard conformant, exceptions are
dnl not used but STL is.
dnl 'make -f Makefile startup' will generate the configure file from
-dnl configure.in correctly and can be run at any time
+dnl configure.ac correctly and can be run at any time
AC_PREREQ(2.50)
-AC_INIT(configure.in)
+AC_INIT(configure.ac)
AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
diff --git a/debian/rules b/debian/rules
index 3979bd810..05dcf813c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ build-manpages: build/build-manpages-stamp
build/environment.mak: build/configure-stamp
@true
-configure: configure.in
+configure: configure.ac
build/configure-stamp: configure
dh_testdir
-mkdir build
diff --git a/prepare-release b/prepare-release
index 73c0be602..2d8502d7f 100755
--- a/prepare-release
+++ b/prepare-release
@@ -39,7 +39,7 @@ if [ "$1" = 'pre-export' ]; then
make update-po
fi
- sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.in
+ sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
elif [ "$1" = 'post-build' ]; then
if [ "$DISTRIBUTION" != "UNRELEASED" ]; then