The configure option --with-build-number=0 is interpreted differently in
different places. The configure script itself accepts 0 as an actual
build number and puts '#define BUILDNR "+build0"' into config.h. The
code in python/automake.mk treats 0 as "no build number" and puts
'BUILDNR = ""' into version.py.
This commit avoids the problem by not passing 0 as a build number.
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
debian/rules | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/debian/rules b/debian/rules
index c88afde..7e2a991 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,12 @@ else
CFLAGS += -O2
endif
+ifeq ($(BUILD_NUMBER),0)
+BUILD_NUMBER_OPTION =
+else
+BUILD_NUMBER_OPTION = --with-build-number=$(BUILD_NUMBER)
+endif
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -41,7 +47,7 @@ configure-stamp:
cd _debian && ( \
test -e Makefile || \
../configure --prefix=/usr --localstatedir=/var --enable-ssl \
- --sysconfdir=/etc --with-build-number=$(BUILD_NUMBER) \
+ --sysconfdir=/etc $(BUILD_NUMBER_OPTION) \
CFLAGS="$(CFLAGS)" $(DATAPATH_CONFIGURE_OPTS))
touch configure-stamp
--
1.7.2.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
