From: Frank Lahm <franklahm@googlemail.com>
Date: Fri, 15 Mar 2013 12:41:39 +0000 (+0100)
Subject: Merge remote branch 'github/develop' into develop
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89e6bd07ecee758e784b77e5de357525dda6db0b;hp=c499c9628afeae21d95d924d74cc335429066163;p=netatalk.git

Merge remote branch 'github/develop' into develop
---

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 2e242d95..ddff6c3e 100644
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -2,7 +2,7 @@
 
 pkgconfdir = @PKGCONFDIR@
 BUILT_SOURCES =
-EXTRA_DIST =
+EXTRA_DIST = afpstats-service.xml afpstats_service_glue.h
 CLEANFILES =
 DISTCLEANFILES =
 
@@ -68,7 +68,6 @@ endif
 
 if HAVE_DBUS_GLIB
 BUILT_SOURCES += afpstats_service_glue.h
-EXTRA_DIST += afpstats-service.xml
 DISTCLEANFILES += afpstats_service_glue.h
 
 afpstats_service_glue.h: afpstats-service.xml