From 72a119c84be19c8d3d792d7476644e71892ef377 Mon Sep 17 00:00:00 2001 From: Michael Roth Date: Wed, 30 Sep 2009 00:36:03 +0200 Subject: zlib: Replace negative logic in Makefile with positive Positive logic is easier to read and understand than something like 'if not option=yes then foo else bar'. Signed-off-by: Michael Roth Signed-off-by: Peter Korsgaard --- package/zlib/zlib.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/zlib') diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index 41d063274..a67a5e830 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -18,14 +18,14 @@ $(ZLIB_DIR)/.patched: $(DL_DIR)/$(ZLIB_SOURCE) $(CONFIG_UPDATE) $(@D) touch $@ -ifneq ($(BR2_PREFER_STATIC_LIB),y) -ZLIB_PIC := -fPIC -ZLIB_SHARED := --shared -ZLIB_TARGET := $(TARGET_DIR)/usr/lib/libz.so -else +ifeq ($(BR2_PREFER_STATIC_LIB),y) ZLIB_PIC := ZLIB_SHARED := ZLIB_TARGET := $(STAGING_DIR)/usr/lib/libz.a +else +ZLIB_PIC := -fPIC +ZLIB_SHARED := --shared +ZLIB_TARGET := $(TARGET_DIR)/usr/lib/libz.so endif $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched -- cgit v1.2.3-55-g7522