summary refs log tree commit diff
diff options
context:
space:
mode:
-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)