aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2021-07-03 16:33:14 +0530
committerArun Isaac2021-07-03 16:33:14 +0530
commitfaf3e736d6f42d593e16df29b25f5b27d39f2822 (patch)
treea3b3589aff33dec4e266731822c0ad653e2502dd
parent6700ba0b21aa704753b928f378d2461754f378cc (diff)
downloadccwl-faf3e736d6f42d593e16df29b25f5b27d39f2822.tar.gz
ccwl-faf3e736d6f42d593e16df29b25f5b27d39f2822.tar.lz
ccwl-faf3e736d6f42d593e16df29b25f5b27d39f2822.zip
doc: Move skribilo configuration into doc directory.
* ccwl/skribilo.scm: Move to ... * doc/skribilo.scm: ... here. * doc/ccwl.skb: Import (doc skribilo) instead of (ccwl skribilo). * Makefile.am ($(SKRIBILO_BUILD_DIR)/ccwl.info, $(SKRIBILO_BUILD_DIR)/ccwl.html): Depend on doc/skribilo.go instead of ccwl/skribilo.go. * Makefile.am (clean-local): Delete doc/skribilo.go instead of ccwl/skribilo.go.
-rw-r--r--Makefile.am6
-rw-r--r--doc/ccwl.skb2
-rw-r--r--doc/skribilo.scm (renamed from ccwl/skribilo.scm)2
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index ffb842d..bf370ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,11 +92,11 @@ $(SKRIBILO_BUILD_DIR)/%.cwl: doc/%.scm
info-local: $(SKRIBILO_BUILD_DIR)/ccwl.info
html-local: $(SKRIBILO_BUILD_DIR)/ccwl.html
-$(SKRIBILO_BUILD_DIR)/ccwl.info: doc/ccwl.skb ccwl/skribilo.go $(DOC_IMAGES) $(DOC_OTHER_DEPENDENCIES)
+$(SKRIBILO_BUILD_DIR)/ccwl.info: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER_DEPENDENCIES)
$(MKDIR_P) $(SKRIBILO_BUILD_DIR)
$(AM_V_GEN)$(top_builddir)/pre-inst-env $(SKRIBILO) -t info $< -o $@
-$(SKRIBILO_BUILD_DIR)/ccwl.html: doc/ccwl.skb ccwl/skribilo.go $(DOC_IMAGES) $(DOC_OTHER_DEPENDENCIES)
+$(SKRIBILO_BUILD_DIR)/ccwl.html: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER_DEPENDENCIES)
rm -rf $@
$(MKDIR_P) $@
$(AM_V_GEN)$(top_builddir)/pre-inst-env $(SKRIBILO) -t html $< -o $@/index.html
@@ -139,4 +139,4 @@ website/manual/dev/en: $(SKRIBILO_BUILD_DIR)/ccwl.html
# The clean target depends on clean-local. Use clean-local to clean
# up several artifacts not handled automatically by automake.
clean-local:
- rm -rf .depends ccwl/skribilo.go website/index.html website/manual $(SKRIBILO_BUILD_DIR)
+ rm -rf .depends doc/skribilo.go website/index.html website/manual $(SKRIBILO_BUILD_DIR)
diff --git a/doc/ccwl.skb b/doc/ccwl.skb
index a56e4fa..fcf6e25 100644
--- a/doc/ccwl.skb
+++ b/doc/ccwl.skb
@@ -17,7 +17,7 @@
;;; along with ccwl. If not, see <https://www.gnu.org/licenses/>.
(use-modules (skribilo lib)
- (ccwl skribilo))
+ (doc skribilo))
(document :title [Concise Common Workflow Language]
(chapter :title [Introduction]
diff --git a/ccwl/skribilo.scm b/doc/skribilo.scm
index 3420ba8..4a1eda0 100644
--- a/ccwl/skribilo.scm
+++ b/doc/skribilo.scm
@@ -22,7 +22,7 @@
;;; Code:
-(define-module (ccwl skribilo)
+(define-module (doc skribilo)
#:use-module (rnrs io ports)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)