X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=932f495f0a0c64e05936df710c134726ac33c5bd;hb=1e3f34c7693bcabae8e443ac1b246680ef9b60e2;hp=9cad47b72069ab2cafb68257766c1d9b07f19cdd;hpb=f6eb6b202533ad393b8d1d8e6ae6e502cbf19caf;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 9cad47b72..932f495f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,6 +108,7 @@ SUFFIXES += .in
 	    sed \
 		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+                -e 's,[@]DBDIR[@],$(DBDIR),g' \
                 -e 's,[@]PERL[@],$(PERL),g' \
                 -e 's,[@]PYTHON[@],$(PYTHON),g' \
                 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
@@ -144,7 +145,7 @@ dist-hook-git: distfiles
 	  (cd datapath && $(MAKE) distfiles);				    \
 	  (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) |	    \
 	    sort -u > all-distfiles;					    \
-	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |	    \
+	  (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |	    \
 	    sort -u > all-gitfiles;					    \
 	  comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
 	  if test -s missing-distfiles; then				    \
@@ -222,3 +223,4 @@ include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
+include planetlab/automake.mk