[csw-devel] SF.net SVN: gar:[15575] csw/mgar/pkg/tcl/trunk/Makefile

[igalic at users.sourceforge.net]

Revision: 15575
          http://gar.svn.sourceforge.net/gar/?rev=15575&view=rev
Author:   igalic
Date:     2011-09-08 17:32:18 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
tcl: make sure the selective library versioning hits the right libs (was off by one dash)
remove some checkpkg overrides, by doing a replace of the offensive paths.

Modified Paths:
--------------
    csw/mgar/pkg/tcl/trunk/Makefile

Modified: csw/mgar/pkg/tcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl/trunk/Makefile	2011-09-08 16:47:59 UTC (rev 15574)
+++ csw/mgar/pkg/tcl/trunk/Makefile	2011-09-08 17:32:18 UTC (rev 15575)
@@ -41,8 +41,9 @@
 #
 RUNTIME_DEP_PKGS_CSWtcl-i386          = CSWsunmath
 RUNTIME_DEP_PKGS_CSWtcl              += CSWlibtcl8-5-0
+RUNTIME_DEP_PKGS_CSWtcl              += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH))
 RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath
-RUNTIME_DEP_PKGS_CSWlibtcl-8-5-0     += $(RUNTIME_DEP_PKGS_CSWlibtcl-8-5-0-$(GARCH))
+RUNTIME_DEP_PKGS_CSWlibtcl8-5-0      += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH))
 RUNTIME_DEP_PKGS_CSWtcl-dev          += CSWlibtcl8-5-0
 
 SPKG_DESC_CSWtcl          = $(DESCRIPTION)
@@ -56,12 +57,9 @@
 
 ARCHALL_CSWtcl-doc = 1 
 
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/tclConfig.sh
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/tclConfig.sh
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tclsh.1
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n
+CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl
 
 
@@ -105,5 +103,7 @@
 	@# Need to manually create symlink to latest version
 	@echo Creating tclsh link
 	@ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh
+	@perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(libdir)/tclConfig.sh
+	@perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(prefix)/share/man/man1/tclsh.1
 	@$(MAKECOOKIE)
 

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