This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.

commit b0cd15303180f2845fc1b55a6f0c24d6b3621a46
Author: Alastair McKinstry <mckins...@debian.org>
Date:   Sat Feb 20 12:50:27 2016 +0000

    Set prefix= to the appropriate dir $LIBDIR/netcdf/$type in pkgconfig files
---
 debian/rules | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 36c58d9..f6560b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,8 +81,10 @@ override_dh_auto_install:
        for d in mpi pnetcdf ; do \
                sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < 
debian/libnetcdf-$$d-dev.postinst.in \
                        > debian/libnetcdf-$$d-dev.postinst ; \
+               echo "prefix=$(LIBDIR)/netcdf/$$(d)" > 
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
                sed -e 's/-lnetcdf/-lnetcdf_$$d/' < 
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
-                       > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
+                       | grep -v "prefix=" \
+                       >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
                mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.so.11.0.0 
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \
                ln -sf $(LIBDIR)/libnetcdf_$$d.so.11.0.0        
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
                ln -sf libnetcdf_$$d.so.11.0.0 
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11; \
@@ -91,7 +93,8 @@ override_dh_auto_install:
                dh_link -p libnetcdf-$$d-dev /usr/include 
$(LIBDIR)/netcdf/$$d/include ; \
                done
        # Serial; one-off only
-       cp -a debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc  
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc 
+       echo "prefix=$(LIBDIR)/netcdf/serial" > 
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc 
+       grep -v "prefix=" debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc >> 
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc 
        cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF  
debian/tmp/$(LIBDIR)/cmake/netCDF
        cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr
        cp -a debian/tmp-serial/usr/share debian/tmp/usr

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/netcdf.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to