From 381415ad913c89cc5cea19d38480fcb4e8097b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com>
Date: Tue, 3 May 2022 19:21:04 +0200
Subject: [PATCH] Fix elpa location
---
cmake/PugsDoc.cmake | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/cmake/PugsDoc.cmake b/cmake/PugsDoc.cmake
index e6fe806ab..0cd8a4c58 100644
--- a/cmake/PugsDoc.cmake
+++ b/cmake/PugsDoc.cmake
@@ -26,7 +26,7 @@ if (EMACS)
add_custom_command(
COMMENT "Check Emacs packages for documentation building"
- OUTPUT "${PUGS_SOURCE_DIR}/doc/elpa"
+ OUTPUT "${PUGS_SOURCE_DIR}/doc/lisp/elpa"
COMMAND
${CMAKE_COMMAND} -E env
PUGS=${PUGS_BINARY_DIR}/pugs
@@ -37,7 +37,7 @@ if (EMACS)
DEPENDS ${ORG_GENERATOR_FILES}
)
- add_custom_target(pugsdoc-download-elpa DEPENDS "${PUGS_SOURCE_DIR}/doc/elpa")
+ add_custom_target(pugsdoc-download-elpa DEPENDS "${PUGS_SOURCE_DIR}/doc/lisp/elpa")
add_custom_command(
OUTPUT "${PUGS_BINARY_DIR}/doc/userdoc.html"
@@ -48,7 +48,13 @@ if (EMACS)
PUGS_SOURCE_DIR=${PUGS_SOURCE_DIR}
PUGS_BINARY_DIR=${PUGS_BINARY_DIR}
${EMACS} -Q --script ${PUGS_SOURCE_DIR}/doc/lisp/userdoc-html.el
- DEPENDS "${PUGS_SOURCE_DIR}/doc/userdoc.org" "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-html.el" pugs pugsdoc-dir pugsdoc-download-elpa
+ DEPENDS
+ "${PUGS_SOURCE_DIR}/doc/userdoc.org"
+ "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-html.el"
+ pugs
+ pugsdoc-dir
+ pugsdoc-download-elpa
+ ${ORG_GENERATOR_FILES}
WORKING_DIRECTORY ${PUGS_BINARY_DIR}/doc
COMMENT "Built user documentation in doc/userdoc.html"
VERBATIM)
@@ -68,7 +74,13 @@ if (EMACS)
PUGS_SOURCE_DIR=${PUGS_SOURCE_DIR}
PUGS_BINARY_DIR=${PUGS_BINARY_DIR}
${EMACS} -Q --script ${PUGS_SOURCE_DIR}/doc/lisp/userdoc-pdf.el
- DEPENDS "${PUGS_SOURCE_DIR}/doc/userdoc.org" "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-pdf.el" pugs pugsdoc-dir pugsdoc-download-elpa
+ DEPENDS
+ "${PUGS_SOURCE_DIR}/doc/userdoc.org"
+ "${PUGS_SOURCE_DIR}/doc/lisp/userdoc-pdf.el"
+ pugs
+ pugsdoc-dir
+ pugsdoc-download-elpa
+ ${ORG_GENERATOR_FILES}
WORKING_DIRECTORY ${PUGS_BINARY_DIR}/doc
COMMENT "Built user documentation in doc/userdoc.pdf"
VERBATIM)
--
GitLab