diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-28 20:30:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-28 20:30:44 +0200 |
| commit | 44dad747bf39cb8e352d885bda37cf37b98e3f75 (patch) | |
| tree | e0509989d0ced20e7f06aca96f13de104e8baa3e /package/busybox/Makefile | |
| parent | bc924b61431ffa6c76db5fefa7a5a09951fe6ccb (diff) | |
| parent | e42433d7127f9a50b5dae57fff331ecfdc9883c4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox/Makefile')
| -rw-r--r-- | package/busybox/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 2f1d9369f..4881762a1 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -22,6 +22,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKG_DESCR_UDHCPD},${PKG_SECTION_UDHCPD})) +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_UDHCPD}+= udhcpd-install + CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -56,7 +60,7 @@ else IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif -do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config +do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) @@ -69,10 +73,10 @@ ifeq ($(ADK_DEBUG),y) ${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \ $(IDIR_BUSYBOX)/bin/busybox endif -ifeq ($(ADK_PACKAGE_UDHCPD),y) + +udhcpd-install: ${INSTALL_DIR} ${IDIR_UDHCPD}/etc/ ${INSTALL_DATA} ./files/udhcpd.conf ${IDIR_UDHCPD}/etc/ -endif fake: $(TOPDIR)/.busyboxcfg do-configure do-install |