[pdal] 06/10: Update gtest paths in rules file.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pdal.

commit 950e9c1c34d6df444e4e2c6895828805905d6dff
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 15 21:13:07 2016 +0100

    Update gtest paths in rules file.
---
 debian/changelog |  1 +
 debian/rules     | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae7789c..958596b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pdal (1.4.0-1) UNRELEASED; urgency=medium
     - Update copyright years
     - Update paths to renamed directories and moved files
   * Drop patches applied upstream. Refresh remaining patches.
+  * Update gtest paths in rules file.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 15 Dec 2016 20:47:12 +0100
 
diff --git a/debian/rules b/debian/rules
index 630d5e0..74aec2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,10 @@ MANPAGES := $(wildcard debian/man/*.*.xml)
 
 override_dh_clean:
 	if [ -e debian/gtest.config.guess ]; then \
-		mv debian/gtest.config.guess `ls -d vendor/gtest-*`/build-aux/config.guess ; \
+		mv debian/gtest.config.guess vendor/gtest/build-aux/config.guess ; \
 	fi
 	if [ -e debian/gtest.config.sub ]; then \
-		mv debian/gtest.config.sub   `ls -d vendor/gtest-*`/build-aux/config.sub ; \
+		mv debian/gtest.config.sub   vendor/gtest/build-aux/config.sub ; \
 	fi
 
 	dh_clean debian/man/*.1
@@ -29,11 +29,11 @@ override_dh_clean:
 
 override_dh_auto_configure:
 	# Don't use outdated autotools helper files
-	mv `ls -d vendor/gtest-*`/build-aux/config.guess debian/gtest.config.guess
-	mv `ls -d vendor/gtest-*`/build-aux/config.sub   debian/gtest.config.sub
+	mv vendor/gtest/build-aux/config.guess debian/gtest.config.guess
+	mv vendor/gtest/build-aux/config.sub   debian/gtest.config.sub
 
-	cp /usr/share/misc/config.guess `ls -d vendor/gtest-*`/build-aux/config.guess
-	cp /usr/share/misc/config.sub   `ls -d vendor/gtest-*`/build-aux/config.sub
+	cp /usr/share/misc/config.guess vendor/gtest/build-aux/config.guess
+	cp /usr/share/misc/config.sub   vendor/gtest/build-aux/config.sub
 
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	                     -DCMAKE_INSTALL_LIBDIR=lib \

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