[csw-devel] SF.net SVN: gar:[2237] csw/trunk/lang

[dmichelsen at users.sourceforge.net]

Revision: 2237
          http://gar.svn.sourceforge.net/gar/?rev=2237&view=rev
Author:   dmichelsen
Date:     2008-11-08 12:25:04 +0000 (Sat, 08 Nov 2008)

Log Message:
-----------
jre/jdk: Fix link generation on repackage

Modified Paths:
--------------
    csw/trunk/lang/jdk13/Makefile
    csw/trunk/lang/jre13/Makefile
    csw/trunk/lang/jre14/Makefile

Modified: csw/trunk/lang/jdk13/Makefile
===================================================================
--- csw/trunk/lang/jdk13/Makefile	2008-11-08 11:54:07 UTC (rev 2236)
+++ csw/trunk/lang/jdk13/Makefile	2008-11-08 12:25:04 UTC (rev 2237)
@@ -54,5 +54,6 @@
 	@rm -rf $(DESTDIR)$(prefix)/$(DISTNAME)
 	@ginstall -d $(DESTDIR)$(prefix)
 	@(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix))
+	@rm -f $(DESTDIR)$(prefix)/jdk-1.3
 	@gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/jdk-1.3
 	@$(MAKECOOKIE)

Modified: csw/trunk/lang/jre13/Makefile
===================================================================
--- csw/trunk/lang/jre13/Makefile	2008-11-08 11:54:07 UTC (rev 2236)
+++ csw/trunk/lang/jre13/Makefile	2008-11-08 12:25:04 UTC (rev 2237)
@@ -54,5 +54,6 @@
 	@rm -rf $(DESTDIR)$(prefix)/$(DISTNAME)
 	@ginstall -d $(DESTDIR)$(prefix)
 	@(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix))
+	@rm -f $(DESTDIR)$(prefix)/jre-1.3
 	@gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/jre-1.3
 	@$(MAKECOOKIE)

Modified: csw/trunk/lang/jre14/Makefile
===================================================================
--- csw/trunk/lang/jre14/Makefile	2008-11-08 11:54:07 UTC (rev 2236)
+++ csw/trunk/lang/jre14/Makefile	2008-11-08 12:25:04 UTC (rev 2237)
@@ -15,7 +15,7 @@
 SUFFIXES_i386  = i586
 SUFFIXES = $(SUFFIXES_sparc) $(SUFFIXES_i386)
 
-DISTNAME = j2re$(GARVERSION)
+DISTNAME = j2re$(SPKG_VERSION)
 DISTFILES  = $(foreach S,$(SUFFIXES),j2re-$(GARVERSION)-solaris-$S.sh)
 NOEXTRACT  = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),j2re-$(GARVERSION)-solaris-$S.sh)
 DISTFILES += $(call admfiles,CSWjre14)
@@ -54,5 +54,6 @@
 	@rm -rf $(DESTDIR)$(prefix)/$(DISTNAME)
 	@ginstall -d $(DESTDIR)$(prefix)
 	@(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix))
+	@rm -f $(DESTDIR)$(prefix)/jre-1.4
 	@gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/jre-1.4
 	@$(MAKECOOKIE)


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