diff options
| author | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-01-02 13:00:46 +0000 |
|---|---|---|
| committer | unknown <jperkin/jonathan@chorlton.adsl.perkin.org.uk> | 2008-01-02 13:00:46 +0000 |
| commit | ad367fe00a28d4d3b652900344597f6517fa8462 (patch) | |
| tree | b1dedaef1967d82e3895fb62bd42528e72bf2c0b /scripts | |
| parent | 92e31e96a2c6f2f98e77217534fcc3712e7b4fa5 (diff) | |
| download | mariadb-git-ad367fe00a28d4d3b652900344597f6517fa8462.tar.gz | |
Use pkglibdir to simplify pkgplugindir, and fix the path in a
couple of Makefiles. Continuation of the fix for bug#31736.
libmysqld/Makefile.am:
Use pkglibdir
plugin/daemon_example/Makefile.am:
Use pkglibdir
plugin/fulltext/Makefile.am:
Use pkglibdir
scripts/Makefile.am:
Use pkglibdir
scripts/make_binary_distribution.sh:
Update comment
sql/Makefile.am:
Use pkglibdir
storage/archive/Makefile.am:
Use pkglibdir
storage/blackhole/Makefile.am:
Use pkglibdir
storage/example/Makefile.am:
Use pkglibdir, fix pkgplugindir
storage/federated/Makefile.am:
Use pkglibdir
storage/innobase/Makefile.am:
Use pkglibdir, fix pkgplugindir
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8669e075959..73c22031990 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -90,7 +90,7 @@ CLEANFILES = @server_scripts@ \ mysql_tableinfo \ mysqld_multi -pkgplugindir = $(libdir)/@PACKAGE@/plugin +pkgplugindir = $(pkglibdir)/plugin # Default same as 'pkgdatadir', but we can override it pkgsuppdir = $(datadir)/@PACKAGE@ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 88397052815..864e78657b0 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -30,8 +30,7 @@ # "pkglibdir" is set to the same as "libdir" # "pkgincludedir" is set to the same as "includedir" # "pkgdatadir" is set to the same as "datadir" -# "pkgplugindir" is set to "@prefix@/lib/plugin", -# normally "$libdir/plugin" +# "pkgplugindir" is set to "$pkglibdir/plugin" # "pkgsuppdir" is set to "@prefix@/support-files", # normally the same as "datadir" # |