summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2010-09-01 17:49:25 +0500
committerAlexey Botchkov <holyfoot@mysql.com>2010-09-01 17:49:25 +0500
commitb04e28c8c76cc1680bdf75e265283a148077d090 (patch)
treebf3a0d587ea290a2ef879d2889458a2abc2ceeec
parentd88532110fc70edef4c801ea427a8c8101ff3792 (diff)
parent49dc22b21e36a54da22feff0d36115d31af79290 (diff)
downloadmariadb-git-b04e28c8c76cc1680bdf75e265283a148077d090.tar.gz
merging.
-rw-r--r--libmysqld/Makefile.am24
1 files changed, 10 insertions, 14 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index b4083be0966..dabfa2b02cc 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -1,21 +1,17 @@
-# Copyright (C) 2001-2006 MySQL AB
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
#
-# This library is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-#
-# This file is public domain and comes with NO WARRANTY of any kind
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)