* Makefile.util.def (grub-menulst2cfg): List libraries in ldadd, not

ldflags, to fix link line ordering.

diff --git a/ChangeLog b/ChangeLog
index 5f38faf426880e99b9dcf2fa73effa5e11121ced..9b01330d5d16e6ccd6282eb2ed886a8207607a10 100644 (file)
--- 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 748bb1c59e68e05b5ae41792bc5008aeede3e85a..3e8ae16f5eab9dd5823d3cf1d85c709671b20c9f 100644 (file)
--- 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)';
 };