[osgearth] 01/05: Use -DCMAKE_VERBOSE_MAKEFILE=1 instead of passing MAKE_VERBOSE.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Aug 28 21:29:58 UTC 2015


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

sebastic pushed a commit to branch master
in repository osgearth.

commit 576d712432766a9c72b16422b9cce6910ade5f08
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 28 17:02:47 2015 +0200

    Use -DCMAKE_VERBOSE_MAKEFILE=1 instead of passing MAKE_VERBOSE.
---
 debian/changelog | 6 ++++++
 debian/rules     | 8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc3a060..8238967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osgearth (2.7.0+dfsg-1~exp3) UNRELEASED; urgency=medium
+
+  * Use -DCMAKE_VERBOSE_MAKEFILE=1 instead of passing MAKE_VERBOSE.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Aug 2015 22:03:39 +0200
+
 osgearth (2.7.0+dfsg-1~exp2) experimental; urgency=medium
 
   * Update symbols for other architectures.
diff --git a/debian/rules b/debian/rules
index ce5bc34..064e766 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,6 @@ BUILD_DATE := $(shell dpkg-parsechangelog | sed -n 's/^Date: //p' | LC_ALL=C dat
 
 MANPAGES:=$(wildcard debian/man/*.*.xml)
 
-MAKE_VERBOSE=1
-
 %:
 	dh $@ --with pkgkde_symbolshelper
 
@@ -34,7 +32,7 @@ override_dh_clean:
 	-$(RM) -rf build/
 
 override_dh_auto_configure:
-	mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLIB_POSTFIX="" -DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)
+	mkdir -p build && cd build && cmake .. -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLIB_POSTFIX="" -DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	# Create man pages from DocBook XML
@@ -43,10 +41,10 @@ override_dh_auto_build:
 	  mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
 	done
 
-	$(MAKE) $(NJOBS) -C build VERBOSE=$(MAKE_VERBOSE)
+	$(MAKE) $(NJOBS) -C build
 
 override_dh_auto_install:
-	$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE)
+	$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
 
 	mkdir -p $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps && \
 	  cp $(CURDIR)/tests/*.earth $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps/ && \

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



More information about the Pkg-grass-devel mailing list