summaryrefslogtreecommitdiffstats
path: root/rbutil/libtools.make
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-12-16 18:59:38 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-12-16 18:59:38 +0000
commit98becd207623718b851c44d919077f51e338a5c5 (patch)
treebc097f127179ddf4468068a7c4cd5796504eca14 /rbutil/libtools.make
parentb056e027fc49305672a594916cc12e84c85872be (diff)
downloadrockbox-98becd207623718b851c44d919077f51e338a5c5.tar.gz
rockbox-98becd207623718b851c44d919077f51e338a5c5.zip
mkamsboot: fix building as universal library.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31325 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/libtools.make')
-rw-r--r--rbutil/libtools.make6
1 files 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