diff options
| author | unknown <petr@mysql.com> | 2005-02-20 23:01:07 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-20 23:01:07 +0300 |
| commit | 4ce6711a14667d4b6cdef18b1424944adce45ad8 (patch) | |
| tree | 4c24af9350f1687d3eafdee5b900ee80d74fb244 /server-tools/instance-manager/Makefile.am | |
| parent | 6de9347515d12423ede44ccaafede98b250f542a (diff) | |
| parent | b3b5f8fb651e40506ab51acb12796b0f7d8d98ef (diff) | |
| download | mariadb-git-4ce6711a14667d4b6cdef18b1424944adce45ad8.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review
include/my_sys.h:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/Makefile.am')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 86effe3b9f0..d73ba95ea0a 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -25,7 +25,7 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER noinst_LIBRARIES= liboptions.a libnet.a -liboptions_a_CPPFLAGS= $(CPPFLAGS) \ +liboptions_a_CXXFLAGS= $(CXXFLAGS) \ -DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \ -DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \ -DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock" \ |