aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Kemen <thepeople@openwrt.org>2010-03-05 20:19:48 +0000
committerTravis Kemen <thepeople@openwrt.org>2010-03-05 20:19:48 +0000
commit91167603c878c35426d09c154a1d30142ac6a180 (patch)
tree05c3f7fea83b0f4a1bb557a90c6f6146602fc387
parent47a3a62caac4166638a50a56bd36736c0c4bd46b (diff)
downloadupstream-91167603c878c35426d09c154a1d30142ac6a180.tar.gz
upstream-91167603c878c35426d09c154a1d30142ac6a180.tar.bz2
upstream-91167603c878c35426d09c154a1d30142ac6a180.zip
The attached patch replaces $(1) install by $(if $(1), $(1),
install) in the definition, in order to be able to specify an install rule, which is not always called install (example: trunk/package/ncurses/Makefile has rules called install.libs and install.data). Then its possible to do this in ncurses Makefile: define Build/Install $(call Build/Install/Default, install.libs install.data) endef This patch does not affect anything else, as if no parameter is given, it will use install as before. -Raphael git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19996 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-defaults.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 017a86d1e8..ecc3af499f 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -122,7 +122,7 @@ define Build/Install/Default
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_INSTALL_FLAGS) \
- $(1) install;
+ $(if $(1), $(1), install);
endef
define Build/Dist/Default