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

[wahwah at users.sourceforge.net]

Revision: 15854
          http://gar.svn.sourceforge.net/gar/?rev=15854&view=rev
Author:   wahwah
Date:     2011-10-04 15:15:44 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: small refactoring

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-04 14:13:13 UTC (rev 15853)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-04 15:15:44 UTC (rev 15854)
@@ -26,13 +26,8 @@
   (Structured Query Language) database server.
 endef
 
-# Where to put the init script
-global_sysconfdir = /etc$(BUILD_PREFIX)
-# Where to link the binaries
-global_bindir = $(BUILD_PREFIX)/bin
+INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
 
-INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME)
-
 # Existing databases are in this location
 localstatedir = /var/opt/csw/mysql5
 
@@ -54,7 +49,7 @@
 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
 ALTERNATIVES_CSWmysql-dev = mysql_dev
-ALTERNATIVE_mysql_dev = $(global_bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) 50
+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)),\
 	$(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION))
 ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\
@@ -308,16 +303,16 @@
 	gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \
 		$(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW
 	ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql
-	ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME)
+	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)
 	ginstall -m 644 $(FILEDIR)/cswusergroup \
-		        $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME)
+		        $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME)
 	# Create symlinks to binaries
-	# ginstall -m 755 -d $(PKGROOT)$(global_bindir)
+	# ginstall -m 755 -d $(PKGROOT)$(bindir)
 	#for f in $(PKGROOT)$(bindir)/*; do \
 	#	if echo $$f | grep amd64$$; then continue; fi; \
 	#	if echo $$f | grep sparcv9$$; then continue; fi; \
 	#	ln -s ../$(NAME)/bin/`basename $$f` \
-	#	      $(PKGROOT)$(global_bindir)/`basename $$f`; \
+	#	      $(PKGROOT)$(bindir)/`basename $$f`; \
 	#done
 	# http://www.opencsw.org/bugtrack/view.php?id=4149
 	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)

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