diff options
author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-07-30 21:09:45 +0200 |
---|---|---|
committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-07-30 21:09:45 +0200 |
commit | c473053b925b3d233900ed7bce10f1e63ff08acf (patch) | |
tree | d7889999d2852a9bed51f043da21bf534596a6c2 /scripts/make_binary_distribution.sh | |
parent | f057136f3da173dcbe165d448b3fda5d3e2c9e99 (diff) | |
download | mariadb-git-c473053b925b3d233900ed7bce10f1e63ff08acf.tar.gz |
Generate "config.h" directly into the "include" directory, later copied
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
config/ac-macros/misc.m4:
aclocal in automake 1.8 can't handle AC_REQUIRE on
a user macro defined in the same included file.
cmd-line-utils/libedit/Makefile.am:
Changed include path so that current directory is taken first, as there
is a "config.h" there with the same name as the one in top "include".
configure.in:
Generate "config.h" directly into "include", don't pollute top directory
include/Makefile.am:
Copy "config.h" from current directory to "my_config.h", added note in
the make file why there are two identical files with different name.
scripts/make_binary_distribution.sh:
Removed copy of "config.h" from top directory, it is in "include" in a
source tree.
Diffstat (limited to 'scripts/make_binary_distribution.sh')
-rw-r--r-- | scripts/make_binary_distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index dab1bbec956..a87bb03526d 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -257,7 +257,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then rm -f $BASE/lib/*.la fi -copyfileto $BASE/include config.h include/* +copyfileto $BASE/include include/* rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h if [ $BASE_SYSTEM != "netware" ] ; then |