[csw-devel] SF.net SVN: gar:[15864] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile

[wahwah at users.sourceforge.net]

Revision: 15864
          http://gar.svn.sourceforge.net/gar/?rev=15864&view=rev
Author:   wahwah
Date:     2011-10-05 13:07:54 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.1.x-optcsw: small path adjustments

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2011-10-05 12:23:37 UTC (rev 15863)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2011-10-05 13:07:54 UTC (rev 15864)
@@ -27,6 +27,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 = 16
 
@@ -40,11 +42,11 @@
 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.*
 PKGFILES_CSWmysql-dev  += $(prefix)/include.*
 PKGFILES_CSWmysql-dev  += /opt/csw/include/mysql
 OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel
-CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1
+CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1
 ALTERNATIVES_CSWmysql-dev = mysql_dev
 ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50
 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\

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