diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-04-18 14:37:01 -0700 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-04-18 14:37:01 -0700 |
| commit | d6e07dc22e52e1fb79855d001a50e85b75f73403 (patch) | |
| tree | 61ef8fc05ea2303912e80087113f3ee38809e408 /Makefile.am | |
| parent | 9508b781eff5a2a6857f1467b0a39dbde06e4446 (diff) | |
| parent | d429061d6bda816fa1faa390f25b2fa85ee79955 (diff) | |
| download | mariadb-git-d6e07dc22e52e1fb79855d001a50e85b75f73403.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, 0 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index b0ad19e9148..24f646cc8e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,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` @@ -51,7 +50,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 |