From 95decc5c720c02815d20d1fea053106baec03173 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 26 Mar 2012 22:23:24 -0700 Subject: [PATCH] debian: add back support older systems w/o dpkg-buildflags Commit 5d0e1f99 removed support for older systems such as Ubuntu 10.04, which don't have dpkg-buildflags. Signed-off-by: "Theodore Ts'o" --- debian/rules | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index d681d21..82a1576 100755 --- a/debian/rules +++ b/debian/rules @@ -117,9 +117,12 @@ INSTALL_PROGRAM ?= $(INSTALL) -p -o root -g root -m 0755 DEFAULT_CFLAGS ?= -g -O2 DEFAULT_LDFLAGS ?= -Wl,-Bsymbolic-functions -CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) -CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \ + dpkg-buildflags --get CFLAGS; else echo $(DEFAULT_CFLAGS) ; fi) +LDFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \ + dpkg-buildflags --get LDFLAGS; else echo $(DEFAULT_LDFLAGS) ; fi) +CPPFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \ + dpkg-buildflags --get CPPFLAGS; fi) ifeq (${DEB_HOST_ARCH},alpha) CFLAGS += -DHAVE_NETINET_IN_H -- 1.8.3.1