SF.net SVN: gar:[22288] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

[lblume at users.sourceforge.net]

Revision: 22288
          http://gar.svn.sourceforge.net/gar/?rev=22288&view=rev
Author:   lblume
Date:     2013-10-22 20:57:24 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Modifying install dirs makes mgar unhappy - adjust scripts instead

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-10-22 18:46:07 UTC (rev 22287)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-10-22 20:57:24 UTC (rev 22288)
@@ -80,12 +80,6 @@
 
 MYSQL_LIB_VER = 18
 
-# Ensure that the install directories match the ISA name so
-# the scripts will work as expected
-bindir     = $(abspath $(bindir_install)/$(ISABINDIR))
-sbindir    = $(abspath $(sbindir_install)/$(ISABINDIR))
-libexecdir = $(abspath $(libexecdir_install)/$(ISABINDIR))
-
 # The daemon to launch is selected by script, should not be automatic
 # Some other files too should probably not be isaexec'd
 EXTRA_ISAEXEC_EXCLUDE_FILES  = /opt/csw/libexec/mysqld
@@ -371,6 +365,17 @@
 		ln -s libmysqlclient.so.18 libmysqlclient_r.so.18)
 	(cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \
 		ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0)
+
+	# Make sure the proper binary is called by the script since
+	# mgar does the configure part using only the base arch name, w/o
+	# the special instructions part
+	for file in mysqld_safe mysqld_multi; do \
+		gsed -i \
+			-e 's|bin/$(MM_BINDIR)|bin/$(ISABINDIR)/|g' \
+			-e 's|sbin/$(MM_BINDIR)|sbin/$(ISABINDIR)|g' \
+			-e 's|libexec/$(MM_BINDIR)|sbin/$(ISABINDIR)|g' \
+			$(DESTDIR)$(bindir)/$$file; \
+	done
 	@$(MAKECOOKIE)
 
 post-merge:

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