diff options
author | unknown <mtaylor@qualinost.(none)> | 2007-04-17 21:36:32 -0700 |
---|---|---|
committer | unknown <mtaylor@qualinost.(none)> | 2007-04-17 21:36:32 -0700 |
commit | 3396f16c92b037d356f754057d20e80fa52222b3 (patch) | |
tree | 22fe6448a03d1d5b3b8ef560726b0c64b1e81e43 /Makefile.am | |
parent | edbe8779f0f96e29c3a1059cb156a2b26835c1df (diff) | |
parent | e9f88b39df516485415aa4f5d0500179b06f4c12 (diff) | |
download | mariadb-git-3396f16c92b037d356f754057d20e80fa52222b3.tar.gz |
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
Makefile.am:
Auto merged
configure.in:
Auto merged
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ee5882e512a..e62cb7179bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,7 @@ 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` @@ -50,6 +51,7 @@ 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 |