From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Apr 2017 12:05:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'mdw/mdw/powm-sec'
X-Git-Tag: v0.4.1~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1fc8a4acb3ef658696038c9c4bd3c155fbc27ac3;hp=-c;p=secnet.git

Merge remote-tracking branch 'mdw/mdw/powm-sec'
---

1fc8a4acb3ef658696038c9c4bd3c155fbc27ac3
diff --combined Makefile.in
index 391acf9,6ef9f2a..406efde
--- a/Makefile.in
+++ b/Makefile.in
@@@ -127,8 -127,6 +127,8 @@@ conffile.yy.h:	conffile.yy.
  conffile.tab.c:	conffile.y
  # End of manual dependencies section
  
 +conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
 +
  secnet:	$(OBJECTS)
  	$(MAKE) version.o # *.o $(filter-out %.o, $^)
  	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
@@@ -166,7 -164,7 +166,7 @@@ eax-%-test.confirm: eax-%-test eax-%-te
  
  check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
  	$(srcdir)/ipaddrset-test.py >ipaddrset-test.new
- 	diff -u ipaddrset-test.expected ipaddrset-test.new
+ 	diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
  
  .PRECIOUS: eax-%-test