Release version 0.22

And fix some 'make distcheck' issues as well

Author: stefwalter

.gitignore

@@ -86,6 +86,4 @@ depcomp
 /modules/*/test-*.log
 /modules/*/test-*.trs
 /test/images
-/doc/cockpit.appdata.xml
-/doc/cockpit.desktop
 

configure.ac

@@ -16,7 +16,7 @@
 # along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 
 AC_INIT([Cockpit],
-        [0.21],
+        [0.22],
         [[email protected]],
         [cockpit],
         [http://www.cockpit-project.org/])

doc/Makefile-doc.am

@@ -1,30 +1,37 @@
 
 @INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/appdata
-appdata_DATA = $(srcdir)/$(appdata_in_files:.xml.in=.xml)
+appdata_DATA = doc/cockpit.appdata.xml
 appdata_in_files = doc/cockpit.appdata.xml.in
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
-desktop_in_files = $(srcdir)/doc/cockpit.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_files = doc/cockpit.desktop.in
+desktop_DATA = doc/cockpit.desktop
 
 pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = $(srcdir)/doc/cockpit.png
+pixmap_DATA = doc/cockpit.png
 
 CLEANFILES += \
 	cockpit.desktop \
 	$(appdata_DATA) \
 	$(desktop_DATA) \
+	doc/.dirstamp \
 	$(NULL)
 
 EXTRA_DIST += \
 	doc/cockpit-transport.svg \
 	doc/cockpit-transport.png \
 	$(appdata_in_files) \
 	$(desktop_in_files) \
+	$(pixmap_DATA) \
 	$(NULL)
 
+# Require that this directory exists
+BUILT_SOURCES += doc/.dirstamp
+doc/.dirstamp:
+	$(AM_V_GEN) $(MKDIR_P) doc && : > doc/.dirstamp
+
 render-images::
 	 inkscape --without-gui --export-area-page \
 		--export-width=1280 --export-height=960 \