summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorunknown <mtaylor@qualinost.(none)>2007-04-18 14:35:15 -0700
committerunknown <mtaylor@qualinost.(none)>2007-04-18 14:35:15 -0700
commitd429061d6bda816fa1faa390f25b2fa85ee79955 (patch)
tree84235f2d70b5bab5f6f0c82dea0e3f88b74bffb2 /Makefile.am
parentff2e7f450b00bf8814833f754fb624c3e239524f (diff)
parentad4922ef673dd026b07f4653b471e7b7b40d0995 (diff)
downloadmariadb-git-d429061d6bda816fa1faa390f25b2fa85ee79955.tar.gz
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint configure.in: Auto merged
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 0 insertions, 2 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