From a271a20d70ed720241995d41201041a2cd4a71b0 Mon Sep 17 00:00:00 2001 From: planetbeing Date: Sat, 17 May 2008 04:11:37 -0400 Subject: [PATCH] gah, more changes necessary to get cross-compiling on Linux to work --- dmg/openssl-0.9.8g/Makefile | 4 +++- dmg/zlib-1.2.3/Makefile.in | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dmg/openssl-0.9.8g/Makefile b/dmg/openssl-0.9.8g/Makefile index e5da3a0..7a0812c 100644 --- a/dmg/openssl-0.9.8g/Makefile +++ b/dmg/openssl-0.9.8g/Makefile @@ -65,7 +65,9 @@ PEX_LIBS= EX_LIBS= EXE_EXT= ARFLAGS= -AR= ar $(ARFLAGS) r +AR?=ar +AR_EX:=$(AR) +AR= $(AR_EX) $(ARFLAGS) r RANLIB ?= /usr/bin/ranlib PERL= /usr/bin/perl TAR= tar diff --git a/dmg/zlib-1.2.3/Makefile.in b/dmg/zlib-1.2.3/Makefile.in index 2fd6e45..70015c5 100644 --- a/dmg/zlib-1.2.3/Makefile.in +++ b/dmg/zlib-1.2.3/Makefile.in @@ -33,8 +33,8 @@ SHAREDLIB=libz.so SHAREDLIBV=libz.so.1.2.3 SHAREDLIBM=libz.so.1 -AR=ar rc -RANLIB=ranlib +AR?=ar +RANLIB?=ranlib TAR=tar SHELL=/bin/sh EXE= @@ -68,7 +68,7 @@ test: all fi libz.a: $(OBJS) $(OBJA) - $(AR) $@ $(OBJS) $(OBJA) + $(AR) rc $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 match.o: match.S