CVS: packaging makefile,1.12,1.13 mspgcc-full-install.nsi,1.10,1.11

Update of /cvsroot/mspgcc/packaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4805/packaging

Modified Files:
	makefile mspgcc-full-install.nsi 
Log Message:
install the new document and use this instead of a link to the docs folder

Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- makefile	5 Jan 2006 01:37:11 -0000	1.12
+++ makefile	5 Jan 2006 02:06:02 -0000	1.13
@@ -324,11 +324,16 @@
 	$(FILELIST_RM) files-before.txt files-after.txt
 
 # Documenation. Currently depends on prebuilt PDFs
+docs-build:
+	rm -rf $(BUILDDIR)/docs
+	mkdir $(BUILDDIR)/docs
+	cp -r $(CVSFILES)/docs/* $(BUILDDIR)/docs
+	cd $(BUILDDIR)/docs; make >$(BUILDDIR)/docs.log 2>&1
 docs-install:
 	rm -rf $(INSTALLDIR)/docs
 	mkdir $(INSTALLDIR)/docs
 ifdef WINDOWS
-	cp mspgcc-manual.pdf mspgcc-faq.pdf $(INSTALLDIR)/docs
+	cp mspgcc-manual.pdf mspgcc-faq.pdf $(BUILDDIR)/docs/documentation.html $(INSTALLDIR)/docs
 	$(FILELIST) $(INSTALLDIR)/docs >$(BUILDDIR)/files-docs.txt
 else
 	mkdir -p $(INSTALLDIR)/share/doc/mspgcc-doc
@@ -412,7 +417,7 @@
         libraries-build         libraries-install
 
 # Examples and documentation
-build-addon: examples-build examples-install docs-install gdbproxy-install
+build-addon: examples-build examples-install docs-build docs-install gdbproxy-install
 
 # Build everything and the windows installer
 build-installer:  clean-installdir build build-addon  windows-installer

Index: mspgcc-full-install.nsi
===================================================================
RCS file: /cvsroot/mspgcc/packaging/mspgcc-full-install.nsi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -d -r1.10 -r1.11
--- mspgcc-full-install.nsi	5 Jan 2006 01:37:11 -0000	1.10
+++ mspgcc-full-install.nsi	5 Jan 2006 02:06:02 -0000	1.11
@@ -144,9 +144,9 @@
         File "${SRCDIR}\stamp.txt"
         !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
         CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\mspgcc-manual.lnk" "$INSTDIR\docs\mspgcc-manual.pdf" "" "$INSTDIR\docs\mspgcc-manual.pdf" 0
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\mspgcc-faq.lnk"    "$INSTDIR\docs\mspgcc-faq.pdf"    "" "$INSTDIR\docs\mspgcc-faq.pdf" 0
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Documentation.lnk"        "$INSTDIR\docs"                   "" "$INSTDIR\docs" 0
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\mspgcc-manual.lnk" "$INSTDIR\docs\mspgcc-manual.pdf" 
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\mspgcc-faq.lnk"    "$INSTDIR\docs\mspgcc-faq.pdf"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Documentation.lnk"        "$INSTDIR\docs\documentation.html"
         !insertmacro MUI_STARTMENU_WRITE_END
         
     SectionEnd



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click