X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=84fb6e799527ecee4917f3b4a698287fac120b46;hb=9ebcf1a3d7524aea36c506f7c0e37bfaa1908dae;hp=889445ac51402ff207b91e8bb8855c545e73f8d5;hpb=b2aec952c7853ac4df54aadf6097d6e930cfe1c4;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 889445ac5..84fb6e799 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ endif
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
 AM_CPPFLAGS += -I $(top_srcdir)/include
+AM_CPPFLAGS += -I $(top_srcdir)/lib
 if HAVE_EXT
 AM_CPPFLAGS += -I $(top_srcdir)/ext/include
 endif
@@ -36,16 +37,19 @@ bin_PROGRAMS =
 bin_SCRIPTS =
 dist_commands_DATA =
 dist_man_MANS =
+dist_pkgdata_SCRIPTS =
+dist_sbin_SCRIPTS =
 man_MANS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
 
-EXTRA_DIST += README.hwtables
+EXTRA_DIST += README.hwtables subst
 
 do_subst = ($(srcdir)/subst VLOG_OPTIONS $(srcdir)/lib/vlog.man | \
-	    sed -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
+	    sed -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
                 -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
                 -e 's,[@]PERL[@],$(PERL),g')
@@ -60,7 +64,7 @@ include lib/automake.mk
 include secchan/automake.mk
 include controller/automake.mk
 include utilities/automake.mk
-include switch/automake.mk
+include udatapath/automake.mk
 include tests/automake.mk
 include include/automake.mk
 include third-party/automake.mk