コミット: 254f05c124094b544aaa2b92ed3bb17acf56e771 - hardware-intel-libva (git)

hardware/intel/libva

コミットメタ情報

• リビジョン: 254f05c124094b544aaa2b92ed3bb17acf56e771 (tree)
• 日時: 2014-04-25 10:54:20
• 作者: Xiang, Haihao <haihao.xiang@inte...>
• コミッター: Xiang, Haihao

ログメッセージ

Fix the broken install

install -d /usr/share/doc/libva/html
install -m 0644 html-out/* /usr/share/doc/libva/html
install: omitting directory html-out/search'
make[2]: *** [install-html-local] Error 1
make[2]: Leaving directory /home/xhh/graphics/ex/vaapi/libva/doc'
make[1]: *** [install-am] Error 2
make[1]: Leaving directory /home/xhh/graphics/ex/vaapi/libva/doc'
make: *** [install-recursive] Error 1

Signed-off-by: Xiang, Haihao <[e-mail]>
(cherry picked from commit ee948e105b97a03b60168b4e5aed3c64a14c37e6)

変更サマリ

• modified: doc/Makefile.am

差分

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -40,7 +40,14 @@ if ENABLE_DOCS
 html: html-out/index.html
 install-html-local:
 	install -d $(DESTDIR)$(docdir)/html
-	install -m 0644 html-out/* $(DESTDIR)$(docdir)/html
+	for file in `ls html-out/` ; do \
+	    if test -f html-out/$$file ; then \
+		install -m 0644 html-out/$$file $(DESTDIR)$(docdir)/html ; \
+	    else \
+		install -d $(DESTDIR)$(docdir)/html/$$file ; \
+		install -m 0644 html-out/$$file/* $(DESTDIR)$(docdir)/html/$$file; \
+	    fi ; \
+	done
 uninstall-local:
 	rm -rf $(DESTDIR)$(docdir)/html
 endif