[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit eb64418670bb9f351522698de1cb52ed92f1c8b5
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Aug 18 10:01:31 2012 +0200

    only one place for the configure options

diff --git a/debian/rules b/debian/rules
index c0647e4..178f1ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+.*/\1/p')
 FULLDEBVERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*-.*\)/\1/p')
 
+CONFIGURE_OPTS := --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
+
 export DEB_LDFLAGS_MAINT_STRIP="-Wl,-Bsymbolic-functions"
 
 get-orig-source:
@@ -16,14 +18,14 @@ get-orig-source:
 	ln -fs $(PACKAGE)-$(VERSION)+dfsg.tar.gz ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz
 
 sql:
-	./configure --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
+	./configure $(CONFIGURE_OPTS)
 	# use this target to generate the dbconfig-common upgrade script once the debian/changelog is ok
 	cat cppserver/database/stored_proc.sql\
 	    cppserver/database/update_db.sql > debian/mysql/$(FULLDEBVERSION)
 	$(MAKE) distclean
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
+	dh_auto_configure -- $(CONFIGURE_OPTS)
 
 override_dh_auto_install:
 	dh_auto_install --destdir="$(CURDIR)/debian/tmp/"

-- 
TANGO distributed control system.