From 5225f3288296190e8fa16a34560b1b7bf2ae4a6b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 23 Nov 2010 15:56:18 +0000
Subject: [PATCH] * Makefile.util.def (grub-menulst2cfg): List libraries in
 ldadd, not ldflags, to fix link line ordering.

---
 ChangeLog         | 5 +++++
 Makefile.util.def | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5f38faf42..9b01330d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.util.def (grub-menulst2cfg): List libraries in ldadd, not
+	ldflags, to fix link line ordering.
+
 2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/Makefile.am (gentrigtables): Put -lm after $<; some
diff --git a/Makefile.util.def b/Makefile.util.def
index 748bb1c59..3e8ae16f5 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -620,5 +620,5 @@ program = {
   ldadd = libgrubmods.a;
   ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };