Tweak doc dirs some more.

jtv · Mar 31, 2024 · dc9c89d · dc9c89d
1 parent 5e7848a
commit dc9c89d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -38,7 +38,7 @@ PROJECT_NUMBER         = @PQXXVERSION@
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = html
+OUTPUT_DIRECTORY       =
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -29,9 +29,6 @@ reference-stamp: Doxyfile.in $(REFERENCE_STAMP_DEP)
 	  $(MKDIR_P) html; \
 	  $(DOXYGEN) Doxyfile; \
 	  touch $@; \
-	  if [ -n "${READTHEDOCS_OUTPUT}" ]; then \
-	    cp -r html "${READTHEDOCS_OUTPUT}/"; \
-	  fi; \
 	else \
 	  echo >&2; \
 	  echo >&2 "*****************************************************"; \

diff --git a/doc/Makefile.in b/doc/Makefile.in
@@ -483,9 +483,6 @@ reference-stamp: Doxyfile.in $(REFERENCE_STAMP_DEP)
 	  $(MKDIR_P) html; \
 	  $(DOXYGEN) Doxyfile; \
 	  touch $@; \
-	  if [ -n "${READTHEDOCS_OUTPUT}" ]; then \
-	    cp -r html "${READTHEDOCS_OUTPUT}/"; \
-	  fi; \
 	else \
 	  echo >&2; \
 	  echo >&2 "*****************************************************"; \

diff --git a/doc/conf.py b/doc/conf.py
@@ -22,12 +22,12 @@
 
 
 if os.environ.get('READTHEDOCS', '').strip() == 'True':
-    root_dir = Path(__file__).parents[1]
-    parent_dir = Path.cwd().parent.absolute()
-    # C++20: Replace -std=c++17 with -std=c++20.
+    source_dir = Path(__file__).parents[1]
+    build_dir = Path.cwd().parent.absolute()
+    # C++23: Upgrade C++ version.
     check_call(
-        [root_dir / 'configure', 'CXXFLAGS=-std=c++17 -O0'], cwd=parent_dir)
-    check_call('doxygen', cwd=(parent_dir / 'doc'))
+        [source_dir / 'configure', 'CXXFLAGS=-std=c++20 -O0'], cwd=build_dir)
+    check_call('doxygen', cwd=(build_dir / 'doc'))
 
 
 # -- General configuration ------------------------------------------------