Master/deb.make: Now adding gnustep-make dependency to the DEB_BUILD_DEPENDS only when creating _debenv file.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@37942 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Ivan Vučica 2014-06-07 17:28:25 +00:00
parent 0d5df98ed6
commit 476d870cd4
2 changed files with 14 additions and 9 deletions

View file

@ -1,3 +1,8 @@
2014-06-07 Ivan Vucica <ivan@vucica.net>
* Master/deb.make: Now adding gnustep-make dependency to the
DEB_BUILD_DEPENDS only when creating _debenv file.
2014-05-11 Ivan Vucica <ivan@vucica.net>
* GNUmakefile.in: Date-time and svn-revision suffix are now using

View file

@ -83,14 +83,6 @@ ifeq ($(_DEB_SHOULD_EXPORT), )
#
ifeq ($(DEB_BUILD_DEPENDS),)
DEB_BUILD_DEPENDS =gnustep-make (>= $(shell dpkg -s gnustep-make | grep 'Version: ' | sed 's/Version: //'))
export DEB_BUILD_DEPENDS
else
DEB_BUILD_DEPENDS +=, gnustep-make (>= $(shell dpkg -s gnustep-make | grep 'Version: ' | sed 's/Version: //'))
export DEB_BUILD_DEPENDS
endif
_debenv.phony::
-rm _debenv
_DEB_SHOULD_EXPORT=1 make _debenv
@ -129,7 +121,15 @@ deb::
else
#
.PHONY: debfiles
ifeq ($(DEB_BUILD_DEPENDS),)
DEB_BUILD_DEPENDS =gnustep-make (>= $(shell dpkg -s gnustep-make | grep 'Version: ' | sed 's/Version: //'))
export DEB_BUILD_DEPENDS
else
DEB_BUILD_DEPENDS +=, gnustep-make (>= $(shell dpkg -s gnustep-make | grep 'Version: ' | sed 's/Version: //'))
export DEB_BUILD_DEPENDS
endif
.PHONY: _debenv
# Export all variables, but only if we explicitly are working with bake_debian_files.sh
export