summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-03-06 17:56:10 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-03-06 17:56:10 +0000
commit72746838f2c00bc5c82a2582c1a3a1a294868a53 (patch)
tree934ddbd8fc771034d354f6d646872a31d275c704 /package
parent842a07b727f37cb1998bb59e9812447df453b43e (diff)
downloadbuildroot-novena-72746838f2c00bc5c82a2582c1a3a1a294868a53.tar.gz
buildroot-novena-72746838f2c00bc5c82a2582c1a3a1a294868a53.zip
makefile cleanup for bzip2
Diffstat (limited to 'package')
-rw-r--r--package/bzip2/bzip2.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 96d86f2e0..0d444ca61 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -29,7 +29,7 @@ endif
$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
touch $@
-$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
+$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-C $(BZIP2_DIR) -f Makefile-libbz2_so
@@ -37,17 +37,17 @@ $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-C $(BZIP2_DIR) libbz2.a
cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
- cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/lib/
+ cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
(cd $(STAGING_DIR)/usr/lib/; \
ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so; \
)
- (cd $(STAGING_DIR)/lib; \
+ (cd $(STAGING_DIR)/usr/lib; \
ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
)
-$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION)
+$(BZIP2_BINARY): $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover
touch -c $@
@@ -83,10 +83,10 @@ endif
rm -rf $(TARGET_DIR)/share/locale
rm -rf $(TARGET_DIR)/usr/share/doc
-$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a
+$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a
mkdir -p $(TARGET_DIR)/usr/include
cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/
- cp $(STAGING_DIR)/lib/libbz2.a $(TARGET_DIR)/usr/lib/
+ cp $(STAGING_DIR)/usr/lib/libbz2.a $(TARGET_DIR)/usr/lib/
rm -f $(TARGET_DIR)/lib/libbz2.so
(cd $(TARGET_DIR)/usr/lib; \
ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \