• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

hardware/intel/libva


Commit MetaInfo

Revisión254f05c124094b544aaa2b92ed3bb17acf56e771 (tree)
Tiempo2014-04-25 10:54:20
AutorXiang, Haihao <haihao.xiang@inte...>
CommiterXiang, Haihao

Log Message

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 <haihao.xiang@intel.com>
(cherry picked from commit ee948e105b97a03b60168b4e5aed3c64a14c37e6)

Cambiar Resumen

Diferencia incremental

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -40,7 +40,14 @@ if ENABLE_DOCS
4040 html: html-out/index.html
4141 install-html-local:
4242 install -d $(DESTDIR)$(docdir)/html
43- install -m 0644 html-out/* $(DESTDIR)$(docdir)/html
43+ for file in `ls html-out/` ; do \
44+ if test -f html-out/$$file ; then \
45+ install -m 0644 html-out/$$file $(DESTDIR)$(docdir)/html ; \
46+ else \
47+ install -d $(DESTDIR)$(docdir)/html/$$file ; \
48+ install -m 0644 html-out/$$file/* $(DESTDIR)$(docdir)/html/$$file; \
49+ fi ; \
50+ done
4451 uninstall-local:
4552 rm -rf $(DESTDIR)$(docdir)/html
4653 endif