| Message ID | 1457888388-6429-1-git-send-email-niels@tonebarker.dk |
|---|---|
| State | Accepted |
| Commit | 28a55b66897f97e3acad36549a4c9e02e7f5dc22 |
| Headers | show |
>>>>> "Niels" == Niels Skou Olsen <niels@tonebarker.dk> writes: > The package makefile attempted to append to KBD_INSTALL_TARGET_OPTS, but this > fails when done before evaluating $(autotools-package). This is because > autotools-package uses ?= to set default values. Instead of appending we now > override KBD_INSTALL_TARGET_OPTS. > Signed-off-by: Niels Skou Olsen <niels@tonebarker.dk> Committed, thanks.
Niels, On Sun, 13 Mar 2016 17:59:48 +0100, Niels Skou Olsen wrote: > The package makefile attempted to append to KBD_INSTALL_TARGET_OPTS, but this > fails when done before evaluating $(autotools-package). This is because > autotools-package uses ?= to set default values. Instead of appending we now > override KBD_INSTALL_TARGET_OPTS. > > Signed-off-by: Niels Skou Olsen <niels@tonebarker.dk> > --- > package/kbd/kbd.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk > index 9dabce1..0243c53 100644 > --- a/package/kbd/kbd.mk > +++ b/package/kbd/kbd.mk > @@ -17,6 +17,6 @@ KBD_LICENSE = GPLv2+ > KBD_LICENSE_FILES = COPYING > KBD_AUTORECONF = YES > > -KBD_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs > +KBD_INSTALL_TARGET_OPTS = MKINSTALLDIRS=$(@D)/config/mkinstalldirs DESTDIR=$(TARGET_DIR) install > > $(eval $(autotools-package)) Could you submit a patch doing the same change in package/util-linux/util-linux.mk ? I'm not really happy with how MKINSTALLDIRS is passed in util-linux. Thanks a lot! Thomas
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk index 9dabce1..0243c53 100644 --- a/package/kbd/kbd.mk +++ b/package/kbd/kbd.mk @@ -17,6 +17,6 @@ KBD_LICENSE = GPLv2+ KBD_LICENSE_FILES = COPYING KBD_AUTORECONF = YES -KBD_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs +KBD_INSTALL_TARGET_OPTS = MKINSTALLDIRS=$(@D)/config/mkinstalldirs DESTDIR=$(TARGET_DIR) install $(eval $(autotools-package))
The package makefile attempted to append to KBD_INSTALL_TARGET_OPTS, but this fails when done before evaluating $(autotools-package). This is because autotools-package uses ?= to set default values. Instead of appending we now override KBD_INSTALL_TARGET_OPTS. Signed-off-by: Niels Skou Olsen <niels@tonebarker.dk> --- package/kbd/kbd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)