[csw-devel] SF.net SVN: gar:[15859] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile

[wahwah at users.sourceforge.net]

Revision: 15859
          http://gar.svn.sourceforge.net/gar/?rev=15859&view=rev
Author:   wahwah
Date:     2011-10-05 08:31:06 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: Try to avoid file conflicts by setting datadir to something version-specific

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-05 05:44:54 UTC (rev 15858)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-05 08:31:06 UTC (rev 15859)
@@ -30,6 +30,8 @@
 
 # Existing databases are in this location
 localstatedir = /var/opt/csw/mysql5
+# To avoid file conflicts
+datadir = $(prefix)/share/mysql/$(BASE_VERSION)
 
 MYSQL_LIB_VER = 15
 
@@ -43,7 +45,7 @@
 PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION))
 PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION))
 PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION))
-PKGFILES_CSWmysql-dev  += $(mandir)/man1/mysql_config\.1
+PKGFILES_CSWmysql-dev  += $(mandir)/man1/mysql_config-$(BASE_VERSION)\.1
 PKGFILES_CSWmysql-dev  += $(prefix)/include.*
 PKGFILES_CSWmysql-dev  += /opt/csw/include/mysql
 OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.