[llvm-branch-commits] [llvm-branch] r142126 - in /llvm/branches/release_30: ./ docs/tutorial/Makefile

[Bill Wendling]

Author: void
Date: Sun Oct 16 03:25:24 2011
New Revision: 142126

URL: http://llvm.org/viewvc/llvm-project?rev=142126&view=rev
Log:
Merging r142125:
------------------------------------------------------------------------
r142125 | void | 2011-10-16 01:24:30 -0700 (Sun, 16 Oct 2011) | 1 line

Install the PNG file as well. PR4780.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_30/   (props changed)
    llvm/branches/release_30/docs/tutorial/Makefile

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 16 03:25:24 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123
+/llvm/trunk:142039,142055,142058,142112,142123,142125

Modified: llvm/branches/release_30/docs/tutorial/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/docs/tutorial/Makefile?rev=142126&r1=142125&r2=142126&view=diff
==============================================================================
--- llvm/branches/release_30/docs/tutorial/Makefile (original)
+++ llvm/branches/release_30/docs/tutorial/Makefile Sun Oct 16 03:25:24 2011
@@ -11,6 +11,7 @@
 include $(LEVEL)/Makefile.common
 
 HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html)
+PNG        := $(wildcard $(PROJ_SRC_DIR)/*.png)
 EXTRA_DIST := $(HTML) index.html
 HTML_DIR   := $(DESTDIR)$(PROJ_docsdir)/html/tutorial
 
@@ -18,6 +19,7 @@
 	$(Echo) Installing HTML Tutorial Documentation
 	$(Verb) $(MKDIR) $(HTML_DIR)
 	$(Verb) $(DataInstall) $(HTML) $(HTML_DIR)
+	$(Verb) $(DataInstall) $(PNG) $(HTML_DIR)
 	$(Verb) $(DataInstall) $(PROJ_SRC_DIR)/index.html $(HTML_DIR)
 
 uninstall-local::