diff options
| author | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-03-06 15:13:14 +0000 |
|---|---|---|
| committer | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-03-06 15:13:14 +0000 |
| commit | fcdf0d11c58e7244a73eb80641dee658e3a87ef5 (patch) | |
| tree | f4537a5c57fb557b3abaff08029182ee06bbe09e /scripts/Makefile.am | |
| parent | 5521666f65216d832f69dc06810999a6d13cd198 (diff) | |
| parent | 14ab7bccaa26eb1f9520056f1452f79fdde076d5 (diff) | |
| download | mariadb-git-fcdf0d11c58e7244a73eb80641dee658e3a87ef5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
libmysqld/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index cf061cc08e5..ac43bb7b0a4 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -92,6 +92,8 @@ CLEANFILES = @server_scripts@ \ mysqldumpslow \ mysqld_multi +pkgplugindir = $(pkglibdir)/plugin + # Default same as 'pkgdatadir', but we can override it pkgsuppdir = $(datadir)/@PACKAGE@ @@ -139,6 +141,7 @@ SUFFIXES = .sh -e 's!@''pkglibdir''@!$(pkglibdir)!g' \ -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \ -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \ + -e 's!@''pkgplugindir''@!$(pkgplugindir)!g' \ -e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \ -e 's!@''sysconfdir''@!$(sysconfdir)!g' \ -e 's!@''mandir''@!$(mandir)!g' \ |