From: Murray Cumming <murrayc@murrayc.com>
Date: Thu, 28 Jun 2012 11:15:08 +0000 (+0200)
Subject: doc: Fix make distcheck
X-Git-Tag: RYGEL_0_15_1~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e30a11a95a8880ccff5a427c2a4c1a8cee0f6dd;p=profile%2Fivi%2Frygel.git

doc: Fix make distcheck

We should really do some bash cleverness to get a list of files of
certain types, and then just INSTALL_DATA those, as gtk-doc.make
seems to do, but this should do for now.
---

diff --git a/doc/reference/librygel-core/Makefile.am b/doc/reference/librygel-core/Makefile.am
index 834b489..d192b3d 100644
--- a/doc/reference/librygel-core/Makefile.am
+++ b/doc/reference/librygel-core/Makefile.am
@@ -54,12 +54,14 @@ uninstall-hook:
 	rm -rf $(DESTDIR)$(datadir)/devhelp/books/librygel-core
 	rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
 
+# The chmod corrects the directory permissions so that distcheck can remove the installed files.
 install-data-hook: devhelp gtkdoc
 	$(MKDIR_P) $(DESTDIR)$(datadir)/devhelp/books/librygel-core/img
-	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-core devhelp/librygel-core/*.*
-	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-core/img devhelp/librygel-core/img/*
+	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-core $(srcdir)/devhelp/librygel-core/*.*
+	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-core/img $(srcdir)/devhelp/librygel-core/img/*
 	$(MKDIR_P) $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
-	cp -R gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
+	cp -d -R $(srcdir)/gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
+	chmod -R u+w $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
 
 all: valadoc devhelp gtkdoc
 
diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index 48fe1dd..6bfc339 100644
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -59,12 +59,13 @@ uninstall-hook:
 	rm -rf $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer
 	rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
 
+# The chmod corrects the directory permissions so that distcheck can remove the installed files.
 install-data-hook: devhelp gtkdoc
 	$(MKDIR_P) $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer/img
-	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer devhelp/librygel-renderer/*.*
-	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer/img devhelp/librygel-renderer/img/*
-	$(MKDIR_P) $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
-	cp -R gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
+	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer $(srcdir)/devhelp/librygel-renderer/*.*
+	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer/img $(srcdir)/devhelp/librygel-renderer/img/*
+	cp -d -R $(srcdir)/gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
+	chmod -R u+w $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
 
 all: valadoc devhelp gtkdoc