summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2014-05-18 22:29:01 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-05-18 22:29:31 -0400
commit618dcd2c2ed18ff6c00ec85f888cd3b9f3811ee3 (patch)
tree65d90bb76f9012f9ceda27cb9fbccc02d4b31d7c
parent196b59c810de7cb954cbaea9f0ad6e68ee8a4913 (diff)
downloade2fsprogs-618dcd2c2ed18ff6c00ec85f888cd3b9f3811ee3.tar.gz
debian: fix debian/rules compatibility with gmake 4.0
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rwxr-xr-xdebian/rules13
1 files changed, 7 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules
index 7e8d01db..5e55e68a 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 \