Fixed conflicts from merge

[netatalk.git] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a2d9efddbbfb045e46dfa433c8640dbd7330287b..e242667ca577a75134659b2fb8cf95fb95e1a62c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,19 +1,10 @@
 # Makefile.am for INSTALL/
 
 EXTRA_DIST = \
-       COPYRIGHT.mtab \
-       INSTALL.txt \
-       FAQ     \
-       README \
-       README.ASUN \
-       README.AFS      \
-       README.FREEBSD  \
-       README.GENERIC  \
-       README.LINUX    \
-       README.NETBSD   \
-       README.OPENBSD  \
-       README.SOLARIS  \
-       README.SUNOS    \
-       README.ULTRIX   \
-       README.mtab             \
-       README.mtab.distribution
+       DEVELOPER \
+       FAQ \
+       README.documentation \
+       README.hidden-items \
+       README.ids \
+       README.AppleTalk \
+       README.ACLs