Blob Blame History Raw
diff -up netcdf-fortran-4.2/netcdf-fortran.pc.in.pkgconfig netcdf-fortran-4.2/netcdf-fortran.pc.in
--- netcdf-fortran-4.2/netcdf-fortran.pc.in.pkgconfig	2011-09-27 08:17:02.000000000 -0600
+++ netcdf-fortran-4.2/netcdf-fortran.pc.in	2013-04-04 19:48:53.967520097 -0600
@@ -1,16 +1,11 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
 includedir=${prefix}/include
-ccompiler=gcc
-cppcompiler=@CXX@
-fcompiler=gfortran
-fflags=-g -O2 -I${includedir}
-flibs=-lnetcdff -lnetcdf
 
-Name: netcdf
-Description: NetCDF Client Library
+Name: NetCDF Fortran
+Description: NetCDF Fortran Client Library
 Version: 4.2
-Libs: -L${libdir} -lnetcdf
+Libs: -L${libdir} -lnetcdff
+Libs.private: -L${libdir} -lnetcdff -lnetcdf
 Cflags: -I${includedir}
-
diff -up netcdf-fortran-4.2/nf-config.in.pkgconfig netcdf-fortran-4.2/nf-config.in
--- netcdf-fortran-4.2/nf-config.in.pkgconfig	2011-09-27 08:17:02.000000000 -0600
+++ netcdf-fortran-4.2/nf-config.in	2013-04-04 19:40:58.668652505 -0600
@@ -6,15 +6,14 @@
 
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 cc="@CC@"
 fc="@FC@"
 cflags=" -I${includedir} @CPPFLAGS@" 
-fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
-libs="-L${libdir} @NC_LIBS@"
-flibs="-L${libdir} @NC_FLIBS@"
+fflags="@MOD_FLAG@${includedir}"
+libs=`pkg-config netcdf-fortran --libs`
+flibs=`pkg-config netcdf-fortran --libs`
 has_dap="@HAS_DAP@"
 has_nc2="@HAS_NC2@"
 has_nc4="@HAS_NC4@"
@@ -113,11 +112,11 @@ while test $# -gt 0; do
 	;;
 
      --libs)
-       	echo $libs
+       	pkg-config netcdf-fortran --libs
        	;;
 
     --flibs)
-       	echo $flibs
+       	pkg-config netcdf-fortran --libs
        	;;
 
     --has-dap)