mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed make distcheck problem.

Browse source 
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
This commit is contained in:
unknown 2007-04-18 14:34:38 -07:00
commit ad4922ef67
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -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

2
configure.in
View file

@ -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

8
debian/rules vendored
View file

@ -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