Merge pull request #742 from LuaAndC/master

build-pkg: remove old name "mxedeb"
This commit is contained in:
Timothy Gu 2015-06-28 19:12:54 +08:00
commit e474c258ff
1 changed files with 4 additions and 4 deletions

View File

@ -3,7 +3,7 @@
-- This file is part of MXE. -- This file is part of MXE.
-- See index.html for further information. -- See index.html for further information.
-- mxedeb, Build DEB packages from MXE packages -- build-pkg, Build binary packages from MXE packages
-- Instructions: http://mxe.redjohn.tk -- Instructions: http://mxe.redjohn.tk
-- Requirements: MXE, lua, tsort, fakeroot, dpkg-deb. -- Requirements: MXE, lua, tsort, fakeroot, dpkg-deb.
@ -70,7 +70,7 @@ SPACE:=$(NOTHING) $(NOTHING)
NAME_WITH_UNDERSCORES:=$(subst $(SPACE),_,$(NAME)) NAME_WITH_UNDERSCORES:=$(subst $(SPACE),_,$(NAME))
print-deps: print-deps:
@$(foreach pkg,$(PKGS),echo \ @$(foreach pkg,$(PKGS),echo \
for-mxedeb $(pkg) \ for-build-pkg $(pkg) \
$(subst $(SPACE),-,$($(pkg)_VERSION)) \ $(subst $(SPACE),-,$($(pkg)_VERSION)) \
$($(pkg)_DEPS);)]] $($(pkg)_DEPS);)]]
local deps_mk_file = io.open('deps.mk', 'w') local deps_mk_file = io.open('deps.mk', 'w')
@ -84,8 +84,8 @@ print-deps:
local make = io.popen(cmd) local make = io.popen(cmd)
for line in make:lines() do for line in make:lines() do
local deps = split(trim(line)) local deps = split(trim(line))
if deps[1] == 'for-mxedeb' then if deps[1] == 'for-build-pkg' then
-- first value is marker 'for-mxedeb' -- first value is marker 'for-build-pkg'
table.remove(deps, 1) table.remove(deps, 1)
-- first value is name of package which depends on -- first value is name of package which depends on
local pkg = table.remove(deps, 1) local pkg = table.remove(deps, 1)