From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 29 Nov 2013 18:46:39 +0000 (+0000)
Subject: xbatmon-simple: Saner build rune.
X-Git-Tag: debian/4.3.0~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=704128164f85f7c3b7a1421a12f4cb11f2edcdec;ds=sidebyside

xbatmon-simple: Saner build rune.
---

diff --git a/cprogs/Makefile b/cprogs/Makefile
index d328bf5..5e42f50 100644
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -48,8 +48,7 @@ really:				really.o myopt.o
 really.o myopt.o rcopy-repeatedly.o: myopt.h
 readbuffer.o writebuffer.o rwbuffer.o wrbufcore.o trivsoundd.o:	rwbuffer.h
 
-xbatmon-simple:	xbatmon-simple.o
-		$(CC) -o $@ $< -L/usr/X11R6/lib -lX11 -lm
+xbatmon-simple: LDLIBS += -lX11 -lm
 
 summer:		summer.o
 		$(CC) -o $@ $< -lnettle -lgmp
diff --git a/debian/changelog b/debian/changelog
index 9627b0f..274f2df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ chiark-utils (4.2.1~~iwj4) unstable; urgency=low
     better than removing the restriction, because it would be dangerous to
     relax this security barrier in existing deployments.)  Closes:#693356.
   * watershed; Provide -h and --help options.  Closes:#659989.
+  * xbatmon-simple: Saner build rune.
 
  --