build: Include OS specific completions in tarball

This should fix #1282,
although still doesn't deal with the issue of including tests for them
or not.

completions/Makefile.am

@@ -1,5 +1,4 @@
-bashcompdir = $(datadir)/$(PACKAGE)/completions
-bashcomp_DATA = 2to3 \
+cross_platform = 2to3 \
 		7z \
 		a2x \
 		abook \
@@ -501,27 +500,36 @@ bashcomp_DATA = 2to3 \
 		zopfli \
 		zopflipng
 
+solaris_extra = pkgutil
 
-if SOLARIS
-bashcomp_DATA += pkgutil
-endif
-
-if BSD
-bashcomp_DATA += pkg_delete
-endif
+bsd_extra = pkg_delete
 
-if FREEBSD
-bashcomp_DATA += \
+freebsd_extra = \
 		freebsd-update \
 		kldload \
 		kldunload \
 		portinstall \
 		portsnap \
 		portupgrade
-endif
 
+# We include all the files in the tarball
+EXTRA_DIST = $(bashcomp_DATA) \
+	     $(solaris_extra) \
+	     $(bsd_extra) \
+	     $(freebsd_extra)
 
-EXTRA_DIST = $(bashcomp_DATA)
+bashcompdir = $(datadir)/$(PACKAGE)/completions
+bashcomp_DATA = $(cross_platform)
+# We add only the completions that are relevant for the current platform we're installing on.
+if SOLARIS
+bashcomp_DATA += $(solaris_extra)
+endif
+if BSD
+bashcomp_DATA += $(bsd_extra)
+endif
+if FREEBSD
+bashcomp_DATA += $(freebsd_extra)
+endif
 
 CLEANFILES = \
 	7za \