bugfix: dist the website in the tarball correctly, and install in the -docs subpackage

configure.ac

@@ -664,6 +664,7 @@ man/Makefile
 docs/Makefile
 docs/html/Makefile
 docs/html/img/Makefile
+docs/html/img/thumbnails/Makefile
 docs/html/videos/Makefile
 docs/api/Makefile
 docs/api/dbus/Makefile

contrib/PackageKit.spec.in

@@ -317,6 +317,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
 %{_datadir}/gtk-doc/html/PackageKit
+%dir %{_datadir}/PackageKit/website
+%{_datadir}/PackageKit/website/*.html
+%{_datadir}/PackageKit/website/*.css
+%dir %{_datadir}/PackageKit/website/img
+%{_datadir}/PackageKit/website/img/*.png
+%dir %{_datadir}/PackageKit/website/img/thumbnails
+%{_datadir}/PackageKit/website/img/thumbnails/*.png
 
 %files smart
 %defattr(-,root,root,-)

docs/html/Makefile.am

@@ -1,6 +1,7 @@
 SUBDIRS = img videos
 
 HTML_FILES =				\
+	style.css			\
 	index.html			\
 	pk-authors.html			\
 	pk-bugs.html			\
@@ -15,9 +16,10 @@ HTML_FILES =				\
 	pk-package-not-found.html	\
 	pk-using.html
 
-EXTRA_DIST = 				\
-	style.css			\
-	$(HTML_FILES)
+helpfiledir = $(datadir)/PackageKit/website
+helpfile_DATA = $(HTML_FILES)
+
+EXTRA_DIST = $(HTML_FILES)
 
 clean-local:
 	rm -f *~

docs/html/img/Makefile.am

@@ -1,53 +1,91 @@
-NULL =
+SUBDIRS = thumbnails
 
 IMAGE_FILES =					\
+	assassin.png				\
+	author-alefebvre.png			\
+	author-btimothy.png			\
+	author-caglar.png			\
+	author-elliot.png			\
+	author-glatzor.png			\
+	author-grzegorzdabrowski.png		\
+	author-hughsie.png			\
+	author-jbowes.png			\
+	author-kenvandine.png			\
+	author-lmacken.png			\
+	author-rnorwood.png			\
+	author-timlau.png			\
+	author-tomparker.png			\
+	author-unknown.png			\
 	dialog-information.png			\
+	gpk-added-deps.png			\
+	gpk-application-groups.png		\
+	gpk-application-search.png		\
+	gpk-auto-update.png			\
+	gpk-backend-status.png			\
+	gpk-battery.png				\
+	gpk-client-codecs.png			\
+	gpk-client-firmware.png			\
+	gpk-client-font.png			\
+	gpk-client-mime-type.png		\
+	gpk-distro-upgrade-notify.png		\
+	gpk-eula.png				\
+	gpk-inhibit.png				\
+	gpk-log.png				\
+	gpk-markdown.png			\
+	gpk-network.png				\
+	gpk-prefs.png				\
+	gpk-progress.png			\
+	gpk-remove-confirm.png			\
+	gpk-repo-auth.png			\
+	gpk-repo-more.png			\
+	gpk-repo.png				\
+	gpk-require-restart.png			\
+	gpk-run-application.png			\
+	gpk-service-pack.png			\
+	gpk-signature.png			\
+	gpk-updates-overview.png		\
+	gpk-updates.png				\
+	gpk-updates-warning.png			\
+	gpk-waiting.png				\
+	kpk-confirm.png				\
+	kpk-information.png			\
+	kpk-notify.png				\
+	kpk-progress.png			\
+	kpk-search.png				\
+	kpk-settings.png			\
+	kpk-update.png				\
 	large-accessories-text-editor.png	\
+	large-applications-development.png	\
+	large-authors.png			\
 	large-dialog-information.png		\
+	large-emblem-favorite.png		\
 	large-emblem-photos.png			\
 	large-help-browser.png			\
 	large-preferences-system.png		\
 	large-system-users.png			\
 	packagekit.png				\
-	pk-web-plugin.png			\
+	pk-command-not-found.png		\
+	pk-opensuse-updater.png			\
+	pk-self-check.png			\
 	pk-update-bugfix.png			\
 	pk-update-enhancement.png		\
 	pk-update-high.png			\
 	pk-update-low.png			\
 	pk-update-normal.png			\
 	pk-update-security.png			\
-	gpk-application-search.png		\
-	gpk-application-groups.png		\
-	gpk-auto-update.png			\
-	gpk-backend-status.png			\
-	gpk-battery.png				\
-	gpk-inhibit.png				\
-	gpk-network.png				\
-	gpk-prefs.png				\
-	gpk-progress.png			\
-	gpk-repo-auth.png			\
-	gpk-repo.png				\
-	gpk-repo-more.png			\
-	gpk-require-restart.png			\
-	gpk-log.png				\
-	gpk-service-pack.png			\
-	gpk-updates.png				\
-	gpk-updates-warning.png			\
-	gpk-waiting.png				\
-	gpk-remove-confirm.png			\
-	gpk-distro-upgrade-notify.png		\
-	gpk-client-firmware.png			\
-	gpk-client-codecs.png			\
-	gpk-client-mime-type.png		\
-	gpk-client-font.png			\
-	gpk-markdown.png			\
+	pk-web-plugin.png			\
+	profile-bevan.png			\
+	profile-graham.png			\
+	profile-suzan.png			\
+	status-bad.png				\
+	status-good.png				\
 	$(NULL)
 
-EXTRA_DIST = 					\
-	$(IMAGE_FILES)				\
-	$(NULL)
+helpfiledir = $(datadir)/PackageKit/website/img
+helpfile_DATA = $(IMAGE_FILES)
+
+EXTRA_DIST = $(IMAGE_FILES)
 
 clean-local:
 	rm -f *~
 
-

docs/html/img/thumbnails/Makefile.am

@@ -0,0 +1,60 @@
+IMAGE_FILES =					\
+	assassin.png				\
+	gpk-added-deps.png			\
+	gpk-application-groups.png		\
+	gpk-application-search.png		\
+	gpk-auto-update.png			\
+	gpk-backend-status.png			\
+	gpk-battery.png				\
+	gpk-client-codecs.png			\
+	gpk-client-firmware.png			\
+	gpk-client-font.png			\
+	gpk-client-mime-type.png		\
+	gpk-distro-upgrade-notify.png		\
+	gpk-eula.png				\
+	gpk-inhibit.png				\
+	gpk-log.png				\
+	gpk-markdown.png			\
+	gpk-network.png				\
+	gpk-prefs.png				\
+	gpk-progress.png			\
+	gpk-remove-confirm.png			\
+	gpk-repo-auth.png			\
+	gpk-repo-more.png			\
+	gpk-repo.png				\
+	gpk-require-restart.png			\
+	gpk-run-application.png			\
+	gpk-service-pack.png			\
+	gpk-signature.png			\
+	gpk-updates-overview.png		\
+	gpk-updates.png				\
+	gpk-updates-warning.png			\
+	gpk-waiting.png				\
+	kpk-confirm.png				\
+	kpk-information.png			\
+	kpk-notify.png				\
+	kpk-progress.png			\
+	kpk-search.png				\
+	kpk-settings.png			\
+	kpk-update.png				\
+	pk-command-not-found.png		\
+	pk-opensuse-updater.png			\
+	pk-self-check.png			\
+	pk-update-bugfix.png			\
+	pk-update-enhancement.png		\
+	pk-update-high.png			\
+	pk-update-low.png			\
+	pk-update-normal.png			\
+	pk-update-security.png			\
+	pk-web-plugin.png			\
+	$(NULL)
+
+helpfiledir = $(datadir)/PackageKit/website/img/thumbnails
+helpfile_DATA = $(IMAGE_FILES)
+
+EXTRA_DIST = $(IMAGE_FILES)
+
+clean-local:
+	rm -f *~
+
+