diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 4 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 471a23f0a73..fed96490397 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -90,6 +90,9 @@ CLEANFILES = @server_scripts@ \ mysql_tableinfo \ mysqld_multi +# Default same as 'pkgdatadir', but we can override it +pkgsuppdir = $(datadir)/@PACKAGE@ + # mysqlbug should be distributed built so that people can report build # failures with it. DISTCLEANFILES = $(BUILT_SOURCES) mysqlbug @@ -134,6 +137,7 @@ SUFFIXES = .sh -e 's!@''pkglibdir''@!$(pkglibdir)!g' \ -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \ -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \ + -e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \ -e 's!@''sysconfdir''@!$(sysconfdir)!g' \ -e 's!@''mandir''@!$(mandir)!g' \ -e 's!@''infodir''@!$(infodir)!g' \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 73d47b1b320..4d027659227 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -31,7 +31,7 @@ # "pkgincludedir" is set to the same as "includedir" # "pkgdatadir" is set to the same as "datadir" # "pkgsuppdir" is set to "@prefix@/support-files", -# normally the same as "datadir" (not to set?) +# normally the same as "datadir" # # The temporary directory path given to "--tmp=<path>" has to be # absolute and with no spaces. @@ -175,6 +175,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then pkglibdir=@pkglibdir@ \ pkgincludedir=@pkgincludedir@ \ pkgdatadir=@pkgdatadir@ \ + pkgsuppdir=@pkgsuppdir@ \ mandir=@mandir@ \ infodir=@infodir@ @@ -215,6 +216,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then fi # FIXME should be handled by make file, and to other dir + mkdir -p $DEST/bin $DEST/support-files cp scripts/mysqlaccess.conf $DEST/bin/ cp support-files/magic $DEST/support-files/ |