diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-04-18 14:34:38 -0700 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-04-18 14:34:38 -0700 |
| commit | ad4922ef673dd026b07f4653b471e7b7b40d0995 (patch) | |
| tree | e784200c097d558558450381d6ba920d6b6146ce | |
| parent | 3b2b2d888d6de2f4b9369eba44a609f7da3e422d (diff) | |
| download | mariadb-git-ad4922ef673dd026b07f4653b471e7b7b40d0995.tar.gz | |
Fixed make distcheck problem.
Makefile.am:
Removed debian/control creation from the top level dist-hook
configure.in:
Create debian/control from configure again
debian/rules:
Protect debian/control from the debuild distclean run.
Prevent a makefile variable loop when settin MYSQL_BASE_VERSION
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 381d1e85526..28551d52da7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,7 +98,6 @@ bin-dist: all # Remove BK's "SCCS" subdirectories from source distribution # Create initial database files for Windows installations. -# Create default debian control file for debian packaging needs dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` rm -f `find $(distdir) -type l -print` @@ -107,7 +106,6 @@ dist-hook: --basedir=$(top_builddir) \ --datadir=$(distdir)/win/data \ --srcdir=$(top_srcdir) - debian/rules control-file && cp $(top_builddir)/debian/control $(distdir)/debian/control tags: support-files/build-tags diff --git a/configure.in b/configure.in index bed74b06bd7..826281f0790 100644 --- a/configure.in +++ b/configure.in @@ -2900,7 +2900,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl cmd-line-utils/libedit/Makefile dnl win/Makefile dnl zlib/Makefile dnl - debian/Makefile debian/defs.mk dnl + debian/Makefile debian/defs.mk debian/control dnl cmd-line-utils/readline/Makefile) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_OUTPUT diff --git a/debian/rules b/debian/rules index 03f85f18160..7b83bc4b97c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,8 +18,8 @@ ifeq ("x$(MYSQL_FLAVOR)","x") endif ifneq ("x$(MYSQL_FLAVOR)","x") - export MYSQL_BASE_VERSION=$(MYSQL_FLAVOR)-$(MYSQL_BASE_VERSION) - export MYSQL_PREVIOUS_BASE_VERSION=$(MYSQL_FLAVOR)-$(MYSQL_PREVIOUS_BASE_VERSION) + MYSQL_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_BASE_VERSION) + MYSQL_PREVIOUS_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_PREVIOUS_BASE_VERSION) endif PACKAGE=mysql-$(MYSQL_BASE_VERSION) @@ -210,8 +210,10 @@ clean: configure.in Makefile.am control-file rm -f build-stamp cp debian/defs.mk debian/defs.mk.sav + cp debian/control debian/control.sav -make distclean - cp debian/defs.mk.sav debian/defs.mk + mv debian/defs.mk.sav debian/defs.mk + mv debian/control.sav debian/control debconf-updatepo |