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

[lblume at users.sourceforge.net]

Revision: 22773
          http://sourceforge.net/p/gar/code/22773
Author:   lblume
Date:     2014-01-02 10:00:23 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Substitution of proper arch directories has to be done more delicately to avoid breaking start script (tracker 5136)

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	2014-01-01 21:07:50 UTC (rev 22772)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-02 10:00:23 UTC (rev 22773)
@@ -384,13 +384,16 @@
 	# 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)|libexec/$(ISABINDIR)|g' \
-			$(DESTDIR)$(bindir)/$$file; \
-	done
+	# Only needed for 64 bit
+	if [ "$(MEMORYMODEL)" = 64 ]; then \
+		for file in mysqld_safe mysqld_multi; do \
+			perl -pi \
+				-e 'if (/^[^#]/) { s|/bin(?!/$(ISABINDIR))|/bin/$(ISABINDIR)|g }' \
+				-e 'if (/^[^#]/) { s|/sbin(?!/$(ISABINDIR))|/sbin/$(ISABINDIR)|g }' \
+				-e 'if (/^[^#]/) { s|/libexec(?!/$(ISABINDIR))|/libexec/$(ISABINDIR)|g }' \
+				$(DESTDIR)$(bindir)/$$file; \
+		done; \
+	fi
 	@$(MAKECOOKIE)
 
 post-merge:

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