From 98becd207623718b851c44d919077f51e338a5c5 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Fri, 16 Dec 2011 18:59:38 +0000 Subject: mkamsboot: fix building as universal library. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31325 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/libtools.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rbutil/libtools.make b/rbutil/libtools.make index a74e54eb78..43ef3d9386 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make @@ -27,7 +27,7 @@ ifndef APPVERSION APPVERSION=$(shell $(TOP)/../tools/version.sh ../) endif CFLAGS += -DVERSION=\"$(APPVERSION)\" -TARGET_DIR ?= $(shell pwd)/ +TARGET_DIR = $(shell pwd)/ BINARY = $(OUTPUT) # when building a Windows binary add the correct file suffix @@ -113,8 +113,8 @@ endif lib$(OUTPUT)-universal: $(TARGET_DIR)lib$(OUTPUT)i386.a \ $(TARGET_DIR)lib$(OUTPUT)ppc.a - @echo lipo $(TARGET_DIR)libmkamsboot.a - $(SILENT) rm -f $(TARGET_DIR)libmkamsboot.a + @echo LIPO $(notdir $(TARGET_DIR)lib$(OUTPUT).a) + $(SILENT) rm -f $(TARGET_DIR)lib$(OUTPUT).a $(SILENT)lipo -create $(TARGET_DIR)lib$(OUTPUT)i386.a \ $(TARGET_DIR)lib$(OUTPUT)ppc.a \ -output $(TARGET_DIR)lib$(OUTPUT).a -- cgit v1.2.3