summaryrefslogtreecommitdiffstats
path: root/make/zlib.mk
diff options
context:
space:
mode:
authorEric Andersen2003-01-17 09:03:59 +0100
committerEric Andersen2003-01-17 09:03:59 +0100
commitef7784a62d2ecd681b37aee7040e71bbb34a51cd (patch)
tree92daacce553b174393de87921912ada04a4ecb6e /make/zlib.mk
parentbe sure include dir is present (diff)
downloadbuildroot-ef7784a62d2ecd681b37aee7040e71bbb34a51cd.tar.gz
buildroot-ef7784a62d2ecd681b37aee7040e71bbb34a51cd.tar.xz
buildroot-ef7784a62d2ecd681b37aee7040e71bbb34a51cd.zip
standardize handling of GNU configure scripts
-Erik
Diffstat (limited to 'make/zlib.mk')
-rw-r--r--make/zlib.mk16
1 files changed, 12 insertions, 4 deletions
diff --git a/make/zlib.mk b/make/zlib.mk
index 11ea17cb1..8de9b5b4c 100644
--- a/make/zlib.mk
+++ b/make/zlib.mk
@@ -20,12 +20,20 @@ $(ZLIB_DIR)/.source: $(DL_DIR)/$(ZLIB_SOURCE)
touch $(ZLIB_DIR)/.source
$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.source
- (cd $(ZLIB_DIR); ./configure --shared --prefix=/usr --exec_prefix=$(STAGING_DIR)/usr/bin \
- --libdir=$(STAGING_DIR)/lib --includedir=$(STAGING_DIR)/include);
+ (cd $(ZLIB_DIR); \
+ PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+ ./configure \
+ --shared \
+ --prefix=/usr \
+ --exec-prefix=$(STAGING_DIR)/usr/bin \
+ --libdir=$(STAGING_DIR)/lib \
+ --includedir=$(STAGING_DIR)/include \
+ );
touch $(ZLIB_DIR)/.configured;
$(ZLIB_DIR)/libz.so.1.1.4: $(ZLIB_DIR)/.configured
- $(MAKE) LDSHARED="$(TARGET_CROSS)gcc --shared" CFLAGS=$(ZLIB_CFLAGS) CC=$(TARGET_CC1) -C $(ZLIB_DIR) all libz.a;
+ $(MAKE) LDSHARED="$(TARGET_CROSS)gcc --shared" CFLAGS=$(ZLIB_CFLAGS) \
+ CC=$(TARGET_CC1) -C $(ZLIB_DIR) all libz.a;
touch -c $(ZLIB_DIR)/libz.so.1.1.4
$(STAGING_DIR)/lib/libz.so.1.1.4: $(ZLIB_DIR)/libz.so.1.1.4
@@ -54,7 +62,7 @@ zlib: uclibc $(TARGET_DIR)/lib/libz.so.1.1.4
zlib-clean:
rm -f $(TARGET_DIR)/lib/libz.so*
- -make -C $(ZLIB_DIR) clean
+ -$(MAKE) -C $(ZLIB_DIR) clean
zlib-dirclean:
rm -rf $(ZLIB_DIR)