[Github-comments] [geany] Fix installation of the manual on Windows (#928)

Colomban Wendling notifications at xxxxx
Thu Mar 3 14:15:49 UTC 2016


```diff
diff --git a/geany.nsi.in b/geany.nsi.in
index 9f55362..3053e13 100644
--- a/geany.nsi.in
+++ b/geany.nsi.in
@@ -191,7 +191,7 @@ Section "Documentation" SEC04
 	SetOverwrite ifnewer
 	SetOutPath "$INSTDIR"
 	File /r "${RESOURCEDIR}\doc"
-	WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" "$INSTDIR\doc\Manual.html"
+	WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" "$INSTDIR\doc\index.html"
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME}
 	CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Documentation.lnk" "$INSTDIR\Documentation.url"
 	!insertmacro MUI_STARTMENU_WRITE_END
diff --git a/src/utils.c b/src/utils.c
index a4372e4..23cb9af 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1912,7 +1912,7 @@ gchar *utils_get_help_url(const gchar *suffix)
 
 #ifdef G_OS_WIN32
 	skip = 8;
-	uri = g_strconcat("file:///", app->docdir, "/Manual.html", NULL);
+	uri = g_strconcat("file:///", app->docdir, "/index.html", NULL);
 	g_strdelimit(uri, "\\", '/'); /* replace '\\' by '/' */
 #else
 	skip = 7;
diff --git a/wscript b/wscript
index d7cabeb..fa10df9 100644
--- a/wscript
+++ b/wscript
@@ -686,7 +686,7 @@ def build(bld):
     local_html_doc_filename = os.path.join(bld.path.abspath(), 'doc', 'geany.html')
     if os.path.exists(html_doc_filename) or os.path.exists(local_html_doc_filename):
         html_dir = '' if is_win32 else 'html/'
-        html_name = 'Manual.html' if is_win32 else 'index.html'
+        html_name = 'index.html'
         start_dir = bld.path.find_dir('doc/images')
         bld.install_files('${DOCDIR}/%simages' % html_dir, start_dir.ant_glob('*.png'), cwd=start_dir)
         bld.install_as('${DOCDIR}/%s%s' % (html_dir, html_name), 'doc/geany.html')
```

---
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/928#issuecomment-191780135
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.geany.org/pipermail/github-comments/attachments/20160303/d274f777/attachment.html>


More information about the Github-comments mailing list