git-svn-id: svn://ultimatepp.org/upp/trunk@2642 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
dolik 2010-08-27 22:18:19 +00:00
parent aee3b0aead
commit c74bc5eade
2 changed files with 4 additions and 4 deletions

View file

@ -360,9 +360,9 @@ ifeq ($(single-package),y)
$(if $S,,$(info Using $(JOBS) parallel jobs ...))
$(if $S,,$(info Parsing package files needed for $(PKG) ...))
ifeq ($(PARSER),)
$(eval $(shell sed -n 's/^#://p;' $(filename) | dash -s '$(PKG)' '$(NESTS)' '$(flags)'))
$(eval $(shell sed -n 's/^#://p;' $(filename) | sh -s '$(PKG)' '$(NESTS)' '$(flags)'))
else
$(eval $(shell dash $(PARSER) '$(PKG)' '$(NESTS)' '$(flags)'))
$(eval $(shell sh $(PARSER) '$(PKG)' '$(NESTS)' '$(flags)'))
endif
$(eval $(PKG)_FLAGS+=MAIN)
$(eval ALLDEPS:=$(call get-deps,$(PKG)))

View file

@ -22,11 +22,11 @@ clean:
$(CURDIR)/debian/ide:
sed -i -e 's/IDE_VERSION[ \t]*"\([0-9]*\)[^"]*"/IDE_VERSION "\1-'$(SERIES)-$(ARCH)'"/' $(CURDIR)/uppsrc/ide/version.h
$(MAKE) $(JOBS) PKG=ide $(compiler) "NESTS=uppsrc" "FLAGS=GUI MT GCC SHARED" VERBOSE=y BINEXT= "BINPREFIX=debian/"
$(MAKE) $(JOBS) PKG=ide $(compiler) "NESTS=uppsrc" "FLAGS=GUI MT GCC SHARED" VERBOSE=Y BINEXT= "BINPREFIX=debian/"
$(CURDIR)/debian/ide-nogtk:
sed -i -e 's/IDE_VERSION[ \t]*"\([0-9]*\)[^"]*"/IDE_VERSION "\1-'$(SERIES)-$(ARCH)'-nogtk"/' $(CURDIR)/uppsrc/ide/version.h
$(MAKE) $(JOBS) PKG=ide $(compiler) "NESTS=uppsrc" "FLAGS=GUI MT NOGTK GCC SHARED" BINEXT=-nogtk "BINPREFIX=debian/"
$(MAKE) $(JOBS) PKG=ide $(compiler) "NESTS=uppsrc" "FLAGS=GUI MT NOGTK GCC SHARED" VERBOSE=Y BINEXT=-nogtk "BINPREFIX=debian/"
build: $(CURDIR)/debian/ide $(CURDIR)/debian/ide-nogtk