jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only derrive HOST_FOO_DEPENDENCIES from FOO_DEPENDENCIES if not set, not nonempty

Browse Source 
In make, ifndef VAR means if 'VAR is not set to the empty string', and
NOT 'VAR is not defined', which meant that you couldn't specify empty
FOO_HOST_DEPENDENCIES.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2012-01-18 15:54:55 +01:00
parent 38faeafab7
commit 1b07928aa6
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/Makefile.autotools.in
View File

@ -203,12 +203,9 @@ endef
# This must be repeated from GENTARGETS_INNER, otherwise we get an empty # This must be repeated from GENTARGETS_INNER, otherwise we get an empty
# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF # _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF
# away from the non-host rule # away from the non-host rule
ifndef $(2)_DEPENDENCIES $(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool,\
ifdef $(3)_DEPENDENCIES
$(2)_DEPENDENCIES = $(filter-out host-automake host-autoconf host-libtool,\
$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
endif
endif
ifeq ($$($(2)_AUTORECONF),YES) ifeq ($$($(2)_AUTORECONF),YES)
$(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK

6
package/Makefile.package.in
View File

@ -542,11 +542,7 @@ $(2)_OVERRIDE_SRCDIR = $($(2)_SITE)
endif endif
endif endif
ifndef $(2)_DEPENDENCIES $(2)_DEPENDENCIES ?= $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
ifdef $(3)_DEPENDENCIES
$(2)_DEPENDENCIES = $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
endif
endif
$(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_STAGING ?= NO
$(2)_INSTALL_IMAGES ?= NO $(2)_INSTALL_IMAGES ?= NO