[SCM] netcdf branch, master, updated. upstream/4.1.1-15-g7508c4c

Francesco Paolo Lovergine frankie at debian.org
Wed Nov 30 12:47:35 UTC 2011


The following commit has been merged in the master branch:
commit a7c4109b97d71464e0f57f89db3326045b43fe91
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Nov 29 17:25:53 2011 +0100

    Now using CURDIR for source tree.

diff --git a/debian/rules b/debian/rules
index 471066c..97fd90d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,6 @@ DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran"
 # Test fails under buildds currently
 DEB_MAKE_CHECK_TARGET = check
 
-SRC_TREE = .
-
 #DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES
 
 # Any makebuilddir/binary would do, /source doesn't:
@@ -33,7 +31,7 @@ install/libnetcdf6::
 
 install/libnetcdf-dev::
 	mv debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/
-	install -m 644 -o root -g root  $(SRC_TREE)/netcdf.pc debian/libnetcdf-dev/usr/lib/pkgconfig/.
+	install -m 644 -o root -g root  $(CURDIR)/netcdf.pc debian/libnetcdf-dev/usr/lib/pkgconfig/.
 	# removes an erroneous libpath due to an upstream oversight in configure.ac
 	sed -i -e 's,-L/usr ,,' -e 's, at FLIBS@,,' debian/libnetcdf-dev/usr/lib/pkgconfig/netcdf.pc
 	# move links and files
@@ -47,9 +45,9 @@ install/netcdf-doc::
 	install -d debian/tmp/doc
 	install -d debian/tmp/usr/share/doc/netcdf
 	install -d debian/tmp/usr/share/info
-	install -m 644 -o root -g root $(SRC_TREE)/man4/*.html debian/tmp/doc/.
-	install -m 644 -o root -g root $(SRC_TREE)/man4/*.pdf debian/tmp/usr/share/doc/netcdf/.
-	install -m 644 -o root -g root $(SRC_TREE)/man4/*.txt debian/tmp/usr/share/doc/netcdf/.
-	install -m 644 -o root -g root $(SRC_TREE)/man4/*.ps debian/tmp/usr/share/doc/netcdf/.
-	install -m 644 -o root -g root $(SRC_TREE)/man4/*.info debian/tmp/usr/share/info/.
+	install -m 644 -o root -g root $(CURDIR)/man4/*.html debian/tmp/doc/.
+	install -m 644 -o root -g root $(CURDIR)/man4/*.pdf debian/tmp/usr/share/doc/netcdf/.
+	install -m 644 -o root -g root $(CURDIR)/man4/*.txt debian/tmp/usr/share/doc/netcdf/.
+	install -m 644 -o root -g root $(CURDIR)/man4/*.ps debian/tmp/usr/share/doc/netcdf/.
+	install -m 644 -o root -g root $(CURDIR)/man4/*.info debian/tmp/usr/share/info/.
 

-- 
The NetCDF Library



More information about the Pkg-grass-devel mailing list