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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sun Aug 28 14:02:03 CEST 2011 

Revision: 15453
          http://gar.svn.sourceforge.net/gar/?rev=15453&view=rev
Author:   wahwah
Date:     2011-08-28 12:02:02 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: better paths

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-28 11:14:09 UTC (rev 15452)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-28 12:02:02 UTC (rev 15453)
@@ -163,41 +163,40 @@
 CHECKPKG_OVERRIDES_CSWgcc4g++ += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4java += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWlibgcj12 += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += file-with-bad-content
 # Due to complex regular expressions
-CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 
 # Only man pages, so not a big problem. Alternatives could be used, but it
 # requires rebuilding libffi.
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/share/man/man3/ffi_call.3|CSWgcc4core|CSWlibffi-dev
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/share/man/man3/ffi.3|CSWgcc4core|CSWlibffi-dev
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/share/man/man3/ffi_prep_cif.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi_call.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi_prep_cif.3|CSWgcc4core|CSWlibffi-dev
 
 # The .a files are necessary
 CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_CSWgcc4objc += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_CSWgcc4java += discouraged-path-in-pkgmap
+
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += discouraged-path-in-pkgmap
 
 # From the 'hopeless errors' department:
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libffi.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcc_s.so|CSWgcc3core|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcj.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libffi.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libgcj.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
-CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libgcc_s.so|CSWgcc3core|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
 
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
@@ -308,7 +307,7 @@
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
 PKGFILES_CSWgcc4g++  = $(bindir)/$(PROGRAM_PREFIX)[cg]\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/$(PROGRAM_PREFIX)\w+-\w+-solaris[\d\.]+-[cg]\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)[cg]\+\+
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -335,11 +334,11 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
 PKGFILES_CSWgcc4gfortran  = $(bindir)/$(PROGRAM_PREFIX)gfortran
-PKGFILES_CSWgcc4gfortran += $(bindir)/$(PROGRAM_PREFIX)\w+-\w+-solaris[\d\.]+-gfortran
+PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
+PKGFILES_CSWgcc4gfortran += $(infodir)/gfortran.*
 PKGFILES_CSWgcc4gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
 OBSOLETED_BY_CSWgcc4gfortran  = CSWgcc4g95
 OBSOLETED_BY_CSWgcc4gfortran += CSWgcc4g95rt
@@ -363,18 +362,18 @@
 PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grmi.*
 PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grepjar
 PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gij
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gc-analyze
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gij
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*fastjar
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjar.*
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjavah
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gorbd
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*addr2name.awk
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gappletviewer
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gkeytool
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gserialver
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gtnameserv
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gnative2ascii
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gc-analyze
 PKGFILES_CSWgcc4java += $(mandir)/.*/gcj.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gij.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/jv.*
@@ -390,7 +389,7 @@
 PKGFILES_CSWgcc4java += $(mandir)/.*/gtnameserv.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gnative2ascii.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
+PKGFILES_CSWgcc4java += $(datadir)/java/.*
 PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a
 PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
 PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
@@ -402,7 +401,7 @@
 PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
 PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
 PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.*
-PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
+PKGFILES_CSWgcc4java += $(infodir)/gcj.*
 PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
 PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
 PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*

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

More information about the devel mailing list