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

[gadavis at users.sourceforge.net]

Revision: 11823
          http://gar.svn.sourceforge.net/gar/?rev=11823&view=rev
Author:   gadavis
Date:     2010-12-07 01:23:30 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
Fix catalog name of CSWlibnetcdf6, remove surplus overrides after gar version bump

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2010-12-07 01:20:17 UTC (rev 11822)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2010-12-07 01:23:30 UTC (rev 11823)
@@ -28,7 +28,7 @@
 RUNTIME_DEP_PKGS_CSWnetcdf += CSWlibnetcdf6
 
 PACKAGES += CSWlibnetcdf6
-CATALOGNAME_CSWlibnetcdf6 = libnetcf6
+CATALOGNAME_CSWlibnetcdf6 = libnetcdf6
 PKGFILES_CSWlibnetcdf6 += /opt/csw/lib/libnetcdf.so.6.0.0
 PKGFILES_CSWlibnetcdf6 += /opt/csw/lib/libnetcdf.so.6\.[0-9\.]+
 PKGFILES_CSWlibnetcdf6 += /opt/csw/lib/libnetcdf.so.6
@@ -154,12 +154,6 @@
 ## OPT_FLAGS_GCC = -O2 -pipe
 OPT_FLAGS_GCC = 
 
-## The development package should pull in the various libs since it's hard to
-## link against what isn't there
-CHECKPKG_OVERRIDES_CSWnetcdf-devel += surplus-dependency|CSWlibnetcdf-c++5
-CHECKPKG_OVERRIDES_CSWnetcdf-devel += surplus-dependency|CSWlibnetcdf6
-CHECKPKG_OVERRIDES_CSWnetcdf-devel += surplus-dependency|CSWlibnetcdff5
-
 ## Mantis bug 4497 means there's no 64 symlink in CSWgcc4corert so you can't
 ## link against these libraries without CSWgcc4core
 CHECKPKG_OVERRIDES_CSWlibnetcdf-c++5 += surplus-dependency|CSWgcc4core


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