backports: fix mconf for old version of ubuntu

This fix was originally provided by Johannes. This replaces
the linker adhoc fix to match more with what we do upstream
without requiring the use of HOSTLOADLIBES.

Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>

diff --git a/backport/kconf/Makefile b/backport/kconf/Makefile
index b307c6570fd0a3ec232a424b9c245a2aee2d5e86..9edd957af0894912e2eb1c86711349eb92369be4 100644 (file)
--- a/backport/kconf/Makefile
+++ b/backport/kconf/Makefile
@@ -3,9 +3,12 @@ CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
 LXDIALOG := lxdialog/checklist.o lxdialog/inputbox.o lxdialog/menubox.o lxdialog/textbox.o lxdialog/util.o lxdialog/yesno.o
 
 conf: conf.o zconf.tab.o
-mconf: LDFLAGS = -Wl,--add-needed $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC))
-mconf: CFLAGS += -DCURSES_LOC="<ncurses.h>" -DLOCALE
+mconf_CFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ccflags) -DLOCALE
+mconf_LDFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC))
+mconf: CFLAGS += $(mconf_CFLAGS)
+
 mconf: mconf.o zconf.tab.o $(LXDIALOG)
+       $(CC) -o mconf $^ $(mconf_LDFLAGS)
 
 .PHONY: clean
 clean: