summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authormtaylor@qualinost.(none) <>2007-04-17 21:36:32 -0700
committermtaylor@qualinost.(none) <>2007-04-17 21:36:32 -0700
commitc9419c608ee9205eb567d6567b695a7e972a688a (patch)
tree22fe6448a03d1d5b3b8ef560726b0c64b1e81e43 /Makefile.am
parentbf2fe14796dfdd164e5d2bcfe05380b8dda145c1 (diff)
parent587cc24f7142bb641b60f2bcde17e0bc7c1597c3 (diff)
downloadmariadb-git-c9419c608ee9205eb567d6567b695a7e972a688a.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
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
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