projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged ipt_time to 2.6 kernel and added ipt_time for all 2.4 archs, closes #185
[openwrt.git]
/
openwrt
/
package
/
rules.mk
diff --git
a/openwrt/package/rules.mk
b/openwrt/package/rules.mk
index
cde92c3
..
9bbf4fa
100644
(file)
--- a/
openwrt/package/rules.mk
+++ b/
openwrt/package/rules.mk
@@
-45,7
+45,11
@@
ifneq ($(strip $(PKG_CAT)),)
$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
rm -rf $(PKG_BUILD_DIR)
mkdir -p $(PKG_BUILD_DIR)
$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
rm -rf $(PKG_BUILD_DIR)
mkdir -p $(PKG_BUILD_DIR)
- $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+ if [ "$(PKG_CAT)" = "unzip" ]; then \
+ unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
+ else \
+ $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \
+ fi
if [ -d ./patches ]; then \
$(PATCH) $(PKG_BUILD_DIR) ./patches ; \
fi
if [ -d ./patches ]; then \
$(PATCH) $(PKG_BUILD_DIR) ./patches ; \
fi
@@
-86,8
+90,8
@@
rebuild:
fi
$(MAKE) compile $(MAKE_TRACE)
fi
$(MAKE) compile $(MAKE_TRACE)
-$(PKG_BUILD_DIR)/.configured:
prepare
-$(PKG_BUILD_DIR)/.built:
configure
+$(PKG_BUILD_DIR)/.configured:
+$(PKG_BUILD_DIR)/.built:
$(PACKAGE_DIR):
mkdir -p $@
$(PACKAGE_DIR):
mkdir -p $@
This page took
0.024067 seconds
and
4
git commands to generate.