From 251561172a886d45ef355473ec31525caaab1ce3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Dec 2018 18:59:03 +0100 Subject: [PATCH] Remove mentions of non-existent docs/$toolkit/install.txt Don't include these files in "make dist" (which seems completely unused anyhow, and probably broken because of this). --- Makefile.in | 1 - build/bakefiles/make_dist.mk | 1 - docs/base/readme.txt | 2 +- docs/index.htm | 12 ++++++------ docs/readme.txt | 6 ++++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 59f1e05acc..c07f2d317d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36866,7 +36866,6 @@ ALL_DIST: distrib_clean # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST $(CP_P) $(DOCDIR)/readme.txt $(DISTDIR)/README.txt - $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index ced718bac6..839aa9938f 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -142,7 +142,6 @@ ALL_DIST: distrib_clean # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST $(CP_P) $(DOCDIR)/readme.txt $(DISTDIR)/README.txt - $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt diff --git a/docs/base/readme.txt b/docs/base/readme.txt index 22c3eb7572..015a970c79 100644 --- a/docs/base/readme.txt +++ b/docs/base/readme.txt @@ -65,7 +65,7 @@ b) Cygwin c) Borland - Please refer to the docs/msw/install.txt. The console sample compiles and + Please refer to the docs/msw/install.md. The console sample compiles and runs but does not pass all tests. d) Other compilers diff --git a/docs/index.htm b/docs/index.htm index 880723d2f0..5d1c28d77e 100644 --- a/docs/index.htm +++ b/docs/index.htm @@ -51,12 +51,12 @@ wxiOS
  • Installation: - wxMSW, - wxGTK, - wxMotif, - wxX11, - wxOSX, - wxQt, + wxMSW, + wxGTK, + wxMotif, + wxX11, + wxOSX, + wxQt,
  • General change log
  • Licence: diff --git a/docs/readme.txt b/docs/readme.txt index e9332ce9af..a831d5a500 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -111,8 +111,10 @@ Installation Unless you have downloaded the binaries for your compiler, you will need to build wxWidgets before you can test out the samples or write your own -applications. For installation information, please see the install.txt file in -the docs subdirectory appropriate for the platform you use. +applications. For installation information, please see the install.md files in +the docs subdirectory appropriate for the platform you use or the "Platform +Details" page of the manual, which contains links to the rendered versions of +these files. Licence