From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 19 May 2014 02:29:01 +0000 (-0400)
Subject: debian: fix debian/rules compatibility with gmake 4.0
X-Git-Tag: v1.42.10~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=618dcd2c2ed18ff6c00ec85f888cd3b9f3811ee3;p=thirdparty%2Fe2fsprogs.git

debian: fix debian/rules compatibility with gmake 4.0

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/debian/rules b/debian/rules
index 7e8d01dbf..5e55e68a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,6 +111,13 @@ INSTALL_PROGRAM ?= $(INSTALL) -p -o root -g root -m 0755
 #INSTALL_PROGRAM += -s
 #endif
 
+ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS)))
+SYMBOL_LIBS := e2fslibs libcomerr2 libss2
+ifneq ($(UTIL_LINUX_NG),yes)
+SYMBOL_LIBS += libblkid1 libuuid1
+endif
+endif
+
 DEFAULT_CFLAGS ?= -g -O2
 DEFAULT_LDFLAGS ?= -Wl,-Bsymbolic-functions
 
@@ -583,11 +590,6 @@ endif
 	dh_strip
 
 	# dpkg symbol handling
-ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS)))
-SYMBOL_LIBS := e2fslibs libcomerr2 libss2
-ifneq ($(UTIL_LINUX_NG),yes)
-SYMBOL_LIBS += libblkid1 libuuid1
-endif
 	for i in $(SYMBOL_LIBS); \
 	do \
 		echo "Generating symbols for $$i..."; \
@@ -596,7 +598,6 @@ endif
 		patch debian/$$i.symbols < debian/$$i.tmp-patch; \
 		/bin/rm debian/$$i.tmp-patch; \
 	done
-endif
 
 	for i in e2fsprogs e2fsprogs-dbg e2fslibs e2fslibs-dbg; do \
 	   $(INSTALL) -p -m 0644 debian/copyright \