diff options
author | Owen Taylor <otaylor@redhat.com> | 2005-01-13 01:56:42 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2005-01-13 01:56:42 +0000 |
commit | 4fa381d14c20a66d6286de042adeac2976bb1206 (patch) | |
tree | 11c861521828586efba7b81ef8dbe7fc91d7b4f4 /gdk-pixbuf/Makefile.am | |
parent | e34f0452b4726ca49fb2fd664749f31650943f93 (diff) | |
download | gtk+-4fa381d14c20a66d6286de042adeac2976bb1206.tar.gz |
Remove GLIB_DIVERT_BEFORE_HELP() on initialization of gdktarget, that was
2005-01-12 Owen Taylor <otaylor@redhat.com>
* configure.in: Remove GLIB_DIVERT_BEFORE_HELP() on
initialization of gdktarget, that was causing it to be
evaluated before host was set. Simplify --with-gdktarget help
message.
* gtk/Makefile.am: Use grep | head -n 1 instead of grep -m 1
which doesn't work with slightly older versions of GNU grep
in install-libtool-import-lib rule.
Diffstat (limited to 'gdk-pixbuf/Makefile.am')
-rw-r--r-- | gdk-pixbuf/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 46dd1243d4..20a151ab37 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -19,7 +19,7 @@ install-libtool-import-lib: # (Unfortunately the GNU linker doesn't yet understand the PRIVATE # directive in .def files.) for entry in `grep PRIVATE gdk_pixbuf.def | sed -e 's/PRIVATE//'`; do \ - file=`nm -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \ + file=`nm -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \ ar d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \ done $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) |