[csw-devel] SF.net SVN: gar:[15467] csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Wed Aug 31 10:32:00 CEST 2011

Revision: 15467
          http://gar.svn.sourceforge.net/gar/?rev=15467&view=rev
Author:   dmichelsen
Date:     2011-08-31 08:32:00 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
gcc4/branches/opt-csw-prefix: Fix alternatives

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================

--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-30 22:32:06 UTC (rev 15466)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-31 08:32:00 UTC (rev 15467)
@@ -152,12 +152,10 @@
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
 
-ALTERNATIVES_CSWgcc4core += cpp
-ALTERNATIVE_cpp = $(bindir)/cpp gcc $(bindir)/cpp$(PROGRAM_SUFFIX) 460
-ALTERNATIVES_CSWgcc4core += gcc
-ALTERNATIVE_gcc = $(bindir)/gcc gcc $(bindir)/gcc$(PROGRAM_SUFFIX) 460
-ALTERNATIVES_CSWgcc4core += gcov
-ALTERNATIVE_gcov = $(bindir)/gcov gcc $(bindir)/gcov$(PROGRAM_SUFFIX) 460
+ALTERNATIVES_CSWgcc4core += gcc4core
+ALTERNATIVE_gcc4core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gcc4core += $(bindir)/gcc gcc_core $(bindir)/gcc$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4core += $(bindir)/gcov gcc_core $(bindir)/gcov$(PROGRAM_SUFFIX)
 
 # Because I can.
 CHECKPKG_OVERRIDES_CSWgcc4core += file-with-bad-content
@@ -324,9 +322,10 @@
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibz1
-ALTERNATIVES_CSWgcc4g++ += g++
-ALTERNATIVE_g++ = $(bindir)/g++ gcc $(bindir)/g++$(PROGRAM_SUFFIX) 460
 
+ALTERNATIVES_CSWgcc4g++ += gcc4g++
+ALTERNATIVE_gcc4g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) 460
+
 OBSOLETED_BY_CSWlibgcc-s1 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcj12
@@ -348,8 +347,9 @@
 PKGFILES_CSWgcc4gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
 OBSOLETED_BY_CSWgcc4gfortran  = CSWgcc4g95
 OBSOLETED_BY_CSWgcc4gfortran += CSWgcc4g95rt
+
 ALTERNATIVES_CSWgcc4gfortran += gfortran
-ALTERNATIVE_gfortran = $(bindir)/gfortran gcc $(bindir)/gfortran$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gfortran += $(bindir)/gfortran gcc_gfortran $(bindir)/gfortran$(PROGRAM_SUFFIX) 460
 
 PACKAGES += CSWgcc4java
 CATALOGNAME_CSWgcc4java       = gcc4java
@@ -417,42 +417,25 @@
 PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
 PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
 
-ALTERNATIVES_CSWgcc4java += gappletviewer
-ALTERNATIVE_gappletviewer = $(bindir)/gappletviewer gcc $(bindir)/gappletviewer-4.6 460
-ALTERNATIVES_CSWgcc4java += gc-analyze
-ALTERNATIVE_gc-analyze = $(bindir)/gc-analyze gcc $(bindir)/gc-analyze-4.6 460
-ALTERNATIVES_CSWgcc4java += gcj-dbtool
-ALTERNATIVE_gcj-dbtool = $(bindir)/gcj-dbtool gcc $(bindir)/gcj-dbtool-4.6 460
-ALTERNATIVES_CSWgcc4java += gcjh
-ALTERNATIVE_gcjh = $(bindir)/gcjh gcc $(bindir)/gcjh-4.6 460
-ALTERNATIVES_CSWgcc4java += gjar
-ALTERNATIVE_gjar = $(bindir)/gjar gcc $(bindir)/gjar-4.6 460
-ALTERNATIVES_CSWgcc4java += gjarsigner
-ALTERNATIVE_gjarsigner = $(bindir)/gjarsigner gcc $(bindir)/gjarsigner-4.6 460
-ALTERNATIVES_CSWgcc4java += gjavah
-ALTERNATIVE_gjavah = $(bindir)/gjavah gcc $(bindir)/gjavah-4.6 460
-ALTERNATIVES_CSWgcc4java += gkeytool
-ALTERNATIVE_gkeytool = $(bindir)/gkeytool gcc $(bindir)/gkeytool-4.6 460
-ALTERNATIVES_CSWgcc4java += gnative2ascii
-ALTERNATIVE_gnative2ascii = $(bindir)/gnative2ascii gcc $(bindir)/gnative2ascii-4.6 460
-ALTERNATIVES_CSWgcc4java += gorbd
-ALTERNATIVE_gorbd = $(bindir)/gorbd gcc $(bindir)/gorbd-4.6 460
-ALTERNATIVES_CSWgcc4java += grmic
-ALTERNATIVE_grmic = $(bindir)/grmic gcc $(bindir)/grmic-4.6 460
-ALTERNATIVES_CSWgcc4java += grmid
-ALTERNATIVE_grmid = $(bindir)/grmid gcc $(bindir)/grmid-4.6 460
-ALTERNATIVES_CSWgcc4java += grmregistry
-ALTERNATIVE_grmregistry = $(bindir)/grmregistry gcc $(bindir)/grmregistry-4.6 460
-ALTERNATIVES_CSWgcc4java += gserialver
-ALTERNATIVE_gserialver = $(bindir)/gserialver gcc $(bindir)/gserialver-4.6 460
-ALTERNATIVES_CSWgcc4java += gtnameserv
-ALTERNATIVE_gtnameserv = $(bindir)/gtnameserv gcc $(bindir)/gtnameserv-4.6 460
-ALTERNATIVES_CSWgcc4java += jcf-dump
-ALTERNATIVE_jcf-dump = $(bindir)/jcf-dump gcc $(bindir)/jcf-dump-4.6 460
-ALTERNATIVES_CSWgcc4java += jv-convert
-ALTERNATIVE_jv-convert = $(bindir)/jv-convert gcc $(bindir)/jv-convert-4.6 460
-ALTERNATIVES_CSWgcc4java += rebuild-gcj-db
-ALTERNATIVE_rebuild-gcj-db = $(bindir)/rebuild-gcj-db gcc $(bindir)/rebuild-gcj-db-4.6 460
+ALTERNATIVES_CSWgcc4java += gcc4java
+ALTERNATIVE_gcc4java += $(bindir)/gappletviewer gcc_gjava $(bindir)/gappletviewer$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gcc4java += $(bindir)/gc-analyze gcc_gjava $(bindir)/gc-analyze$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gcj-dbtool gcc_gjava $(bindir)/gcj-dbtool$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gcjh gcc_gjava $(bindir)/gcjh$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjar gcc_gjava $(bindir)/gjar$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjarsigner gcc_gjava $(bindir)/gjarsigner$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjavah gcc_gjava $(bindir)/gjavah$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gkeytool gcc_gjava $(bindir)/gkeytool$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gnative2ascii gcc_gjava $(bindir)/$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gorbd gcc_gjava $(bindir)/gorbd$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmic gcc_gjava $(bindir)/grmic$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmid gcc_gjava $(bindir)/grmid$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmregistry gcc_gjava $(bindir)/grmregistry$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gserialver gcc_gjava $(bindir)/gserialver$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gtnameserv gcc_gjava $(bindir)/gtnameserv$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/jcf-dump gcc_gjava $(bindir)/jcf-dump$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/jv-convert gcc_gjava $(bindir)/jv-convert$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/rebuild-gcj-db gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX)
 
 PACKAGES += CSWgcc4objc
 CATALOGNAME_CSWgcc4objc       = gcc4objc

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

