summaryrefslogtreecommitdiff
path: root/scripts/Makefile.am
diff options
context:
space:
mode:
authorjperkin/jonathan@chorlton.adsl.perkin.org.uk <>2008-01-08 14:04:03 +0000
committerjperkin/jonathan@chorlton.adsl.perkin.org.uk <>2008-01-08 14:04:03 +0000
commitcb00c207499956c0f2c6174c76db319a2a719448 (patch)
treeccef82dd93c9be6c4b348fa9ec00e44d875d4add /scripts/Makefile.am
parent5c028eb402c8107f6d08849a6b6a79e59dcbf728 (diff)
parente286ac998c4225fbafb5016717a6bf8c979b314c (diff)
downloadmariadb-git-cb00c207499956c0f2c6174c76db319a2a719448.tar.gz
Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/bug-31736-5.1
into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/bug-31736/5.1
Diffstat (limited to 'scripts/Makefile.am')
-rw-r--r--scripts/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b61b614598d..31eb9ccd882 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -93,6 +93,8 @@ CLEANFILES = @server_scripts@ \
mysql_tableinfo \
mysqld_multi
+pkgplugindir = $(pkglibdir)/plugin
+
# Default same as 'pkgdatadir', but we can override it
pkgsuppdir = $(datadir)/@PACKAGE@
@@ -140,6 +142,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' \