summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--src/guile/Makefile.am6
-rw-r--r--src/guile/skribilo/utils/images.in (renamed from src/guile/skribilo/utils/images.scm.in)0
-rw-r--r--substitute.am4
4 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 40924d9..4fe1cee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,6 @@ AC_OUTPUT([Makefile
 	   po/Makefile.in
 	   src/Makefile
 	   src/guile/Makefile
-	   src/guile/skribilo/utils/images.scm
            doc/Makefile
 	   doc/user/Makefile
 	   doc/modules/Makefile
diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am
index 4f18b5d..9c2c706 100644
--- a/src/guile/Makefile.am
+++ b/src/guile/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST =						\
   README						\
   skribilo/source/lisp-lex.l				\
   skribilo/source/xml-lex.l skribilo/source/c-lex.l	\
-  skribilo/utils/images.scm.in skribilo/config.in	\
+  skribilo/utils/images.in skribilo/config.in		\
   srfi/srfi-64.scm srfi/srfi-64.upstream.scm
 
 SOURCES =								\
@@ -93,7 +93,9 @@ nobase_nodist_module_DATA +=			\
 endif ENABLE_GUILE_VM
 
 
-BUILT_SOURCES = skribilo/config.scm
+BUILT_SOURCES =					\
+  skribilo/config.scm				\
+  skribilo/utils/images.scm
 
 .in.scm:
 	$(substitute) "$^" > "$@.tmp" &&	\
diff --git a/src/guile/skribilo/utils/images.scm.in b/src/guile/skribilo/utils/images.in
index dd0c3a0..dd0c3a0 100644
--- a/src/guile/skribilo/utils/images.scm.in
+++ b/src/guile/skribilo/utils/images.in
diff --git a/substitute.am b/substitute.am
index 33d8a75..eb1aaae 100644
--- a/substitute.am
+++ b/substitute.am
@@ -10,6 +10,8 @@ substitute = sed -e 's,[@]guilemoduledir[@],$(guilemoduledir),g'	\
 		 -e 's,[@]PACKAGE_STRING[@],$(PACKAGE_STRING),g'	\
 		 -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g'		\
 		 -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'	\
-		 -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g'
+		 -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g'	\
+		 -e 's,[@]FIG2DEV[@],$(FIG2DEV),g'			\
+		 -e 's,[@]CONVERT[@],$(CONVERT),g'
 
 SUFFIXES = .in