diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-08 17:26:57 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-08 17:26:57 +0200 |
commit | 643800cee0ad5b853f06056ff90d24efa670f68c (patch) | |
tree | d873494ef64659d0cd0a836d2e2dd380d585e5c7 /mk | |
parent | 3c70077f308437281c72431223b532f6f427e1d0 (diff) | |
parent | 081830a11721ddc097fd2272d4e7ebd47cb7f8dd (diff) |
Merge remote branch 'phil/auto-config-in'
Conflicts:
Config.in
package/dropbear/Makefile
package/iptables/Makefile
package/kismet/Makefile
package/nfs-utils/Makefile
package/ntpclient/Makefile
package/openvpn/Makefile
package/pkgmaker
package/rxvt-unicode/Makefile
package/vgp/Makefile
package/wpa_supplicant/Makefile
package/xf86-input-keyboard/Makefile
package/xf86-input-mouse/Makefile
Diffstat (limited to 'mk')
-rw-r--r-- | mk/build.mk | 4 | ||||
-rw-r--r-- | mk/package.mk | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index a4559afef..9b9c6ec8d 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -175,7 +175,7 @@ newpackage: $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile @echo "Edit package/$(PKG)/Makefile to complete" - @echo "Do not forget to add package to package/Config.in" + @echo "choose PKG_SECTION to add it to an existent submenu" ############################################################# # @@ -483,10 +483,12 @@ bulkallmod: done <${TOPDIR}/target/bulk.lst menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) + @echo "Generating menu structure ..." mksh $(TOPDIR)/package/pkgmaker @:>.menu dep: + @echo "Generating dependencies ..." mksh $(TOPDIR)/package/depmaker .PHONY: menu dep diff --git a/mk/package.mk b/mk/package.mk index 4baa73bf0..acc387a48 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -143,6 +143,7 @@ ALL_PKGOPTS+= $(1) PKGNAME_$(1)= $(2) PKGDEPS_$(1)= $(4) PKGDESC_$(1)= $(5) +PKGSECT_$(1)= $(6) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) |