Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
	NEWS
	README
	configure.in
	src/Makefile.am
This commit is contained in:
Guus Sliepen 2011-06-24 21:40:55 +02:00
commit 79e9a4f743
3 changed files with 10 additions and 4 deletions

View file

@ -40,7 +40,7 @@ if TUNEMU
LIBS += -lpcap
endif
AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
dist-hook:
rm -f `find . -type l`