Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 x2x (1.30-2) unstable; urgency=low
 .
   * Merge ubuntu patch, included upstream (closes: #699617)
Author: Barak A. Pearlmutter <bap@debian.org>
Bug-Debian: http://bugs.debian.org/699617

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- x2x-1.30.orig/Makefile.am
+++ x2x-1.30/Makefile.am
@@ -5,7 +5,7 @@
 #
 
 AM_CFLAGS = $(X11_CFLAGS) -Wall
-AM_LDFLAGS = $(X11_LIBS)
+LIBS = $(X11_LIBS)
 
 bin_PROGRAMS = x2x
 
@@ -19,7 +19,7 @@ dist_man1_MANS = x2x.1
 if WIN32
 
 AM_CFLAGS += -DWIN_2_X
-AM_LDFLAGS += -luser32 -lgdi32 # Ugly hack
+LIBS += -luser32 -lgdi32 # Ugly hack
 x2x_SOURCES += keymap.c winmsg.c x2xwin.rc
 
 .o:.rc
