 -
 -src_or_tor_SOURCES = src/or/tor_main.c
 -AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or
--
+ 
 -src/or/tor_main.$(OBJEXT) \
 -  src/or/src_or_tor_cov-tor_main.$(OBJEXT): micro-revision.i
- 
+-
 -AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\""		\
-+AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or \
-+		-DSHARE_DATADIR="\"$(datadir)\"" \
++AM_CPPFLAGS +=  -I$(srcdir)/src/or -Isrc/or		\
++		-DSHARE_DATADIR="\"$(datadir)\""	\
  		-DLOCALSTATEDIR="\"$(localstatedir)\""	\
  		-DBINDIR="\"$(bindir)\""
  

--- src/or/include.am.orig	2017-12-11 20:39:32.100558063 +0100
+++ src/or/include.am	2017-12-11 20:41:36.963076860 +0100
@@ -1,13 +1,5 @@
-bin_PROGRAMS+= src/or/tor
 noinst_LIBRARIES += \

 
 if BUILD_NT_SERVICES
 tor_platform_source=src/or/ntmain.c
@@ -108,51 +100,17 @@
 	$(tor_platform_source)
 
 src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
