Mercurial > hg > mxe-octave-anirudha

changeset 3193:f13064b3aca0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makeinst-script.sh: Enabled Octave documentation in PDF and HTML
author Anirudha Bose <ani07nov@gmail.com>
date Mon, 29 Jul 2013 03:57:18 +0530
parents 8c5f17c2bd88
children ff253aef6d9e
files makeinst-script.sh src/octave.mk
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/makeinst-script.sh
+++ b/makeinst-script.sh
@@ -136,6 +136,11 @@
  CreateShortCut "\$SMPROGRAMS\\Octave\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
  CreateShortCut "\$SMPROGRAMS\Octave\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
  CreateShortCut "\$SMPROGRAMS\Octave\\Octave (No GUI).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
+ CreateDirectory "\$SMPROGRAMS\\Octave\\Documentation"
+ CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave C++ Classes (PDF).lnk" "\$INSTDIR\\share\\doc\\octave\\liboctave.pdf" "" "" 0
+ CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave C++ Classes (HTML).lnk" "\$INSTDIR\\share\\doc\\octave\\liboctave.html\\index.html" "" "" 0
+ CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave (PDF).lnk" "\$INSTDIR\\share\\doc\\octave\\octave.pdf" "" "" 0
+ CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave (HTML).lnk" "\$INSTDIR\\share\\doc\\octave\\octave.html\index.html" "" "" 0
   
 SectionEnd
 
@@ -146,6 +151,8 @@
 
  ; Remove shortcuts
  Delete "\$SMPROGRAMS\Octave\*.*"
+ Delete "\$SMPROGRAMS\Octave\Documentation\*.*"
+ Delete "\$SMPROGRAMS\Octave\Documentation"
  RMDir "\$SMPROGRAMS\Octave"
 
 EOF
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -65,6 +65,7 @@
         $(CONFIGURE_CPPFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
+	--enable-docs \
         $($(PKG)_BLAS_OPTION) \
 	$($(PKG)_CROSS_CONFIG_OPTIONS) \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
@@ -77,7 +78,7 @@
     ## We want both of these install steps so that we install in the
     ## location set by the configure --prefix option, and the other
     ## in a directory tree that will have just Octave files.
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install-html
     if [ $(MXE_SYSTEM) != msvc ]; then \
         $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave install; \
     fi