summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorunknown <mtaylor@qualinost.(none)>2007-04-11 16:38:37 -0700
committerunknown <mtaylor@qualinost.(none)>2007-04-11 16:38:37 -0700
commit09e9d10929e6c60a62371878698e9fd0f79d8833 (patch)
treea6a816678dd1a5b959defd528f270ea7d2f2f603 /Makefile.am
parent1772776e272e67dbdfd1da7fbad211202638b58e (diff)
parent359594ccd2bc10b6d5ca6ab68997880987a26faa (diff)
downloadmariadb-git-09e9d10929e6c60a62371878698e9fd0f79d8833.tar.gz
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debian
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian BitKeeper/deleted/.del-configure.in.rej: Auto merged Makefile.am: Added debian dir to the DIST_SUBDIRS. configure.in: Merged changes from 5.0 for adding debian dir.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 83b99a49f30..ee5882e512a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
mysql-test support-files sql-bench @tools_dirs@ \
win
-DIST_SUBDIRS = $(SUBDIRS) BUILD
+DIST_SUBDIRS = $(SUBDIRS) BUILD debian
DISTCLEANFILES = ac_available_languages_fragment