Patch from Frederic be able to build CDSware out of its source tree.

tiborsimko · Jul 15, 2004 · cfbcd08 · cfbcd08
1 parent 189aae0
commit cfbcd08
Show file tree

Hide file tree

Showing 73 changed files with 110 additions and 101 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -65,7 +65,7 @@ uninstall-local:
 	rm -rf @prefix@/var
 
 create-tables: local-dbexec local-tabfill
-	./modules/miscutil/bin/dbexec < ./modules/miscutil/sql/tabcreate.sql
+	./modules/miscutil/bin/dbexec < $(top_srcdir)/modules/miscutil/sql/tabcreate.sql
 	./modules/miscutil/bin/dbexec < ./modules/miscutil/sql/tabfill.sql
 
 update-v0.3.0-tables update-v0.3.1-tables: local-dbexec
@@ -78,12 +78,12 @@ update-v0.3.0-tables update-v0.3.1-tables: local-dbexec
 	echo "INSERT INTO accACTION (id,name,description,allowedkeywords,optional) VALUES (NULL,'cfgbibrank','configure BibRank','','no');" | ./modules/miscutil/bin/dbexec 
 
 drop-tables: local-dbexec 
-	./modules/miscutil/bin/dbexec < ./modules/miscutil/sql/tabdrop.sql
+	./modules/miscutil/bin/dbexec < $(srcdir)/modules/miscutil/sql/tabdrop.sql
 
-local-dbexec: ./modules/miscutil/bin/dbexec.wml
+local-dbexec: $(srcdir)/modules/miscutil/bin/dbexec.wml
 	(cd ./modules/miscutil/bin; make)
 
-local-tabfill: ./modules/miscutil/sql/tabfill.sql.wml
+local-tabfill: $(srcdir)/modules/miscutil/sql/tabfill.sql.wml
 	(cd ./modules/miscutil/sql; make)
 
 create-demo-site: install
@@ -116,9 +116,9 @@ create-demo-site: install
 	@echo "***********************************************************************"
 
 load-demo-records: install
-	${prefix}/bin/dbexec < ./modules/miscutil/sql/tabbibclean.sql
+	${prefix}/bin/dbexec < $(srcdir)/modules/miscutil/sql/tabbibclean.sql
 	echo "TRUNCATE schTASK;" | ${prefix}/bin/dbexec 
-	${prefix}/bin/bibupload -i ./modules/miscutil/demo/demobibdata.xml
+	${prefix}/bin/bibupload -i $(srcdir)/modules/miscutil/demo/demobibdata.xml
 	${prefix}/bin/bibupload 1
 	@echo ""
 	@echo "***********************************************************************"
@@ -155,8 +155,8 @@ load-demo-records: install
 	@echo "***********************************************************************"
 
 drop-demo-site: install
-	./modules/miscutil/bin/dbexec < ./modules/miscutil/sql/tabdrop.sql
-	./modules/miscutil/bin/dbexec < ./modules/miscutil/sql/tabcreate.sql
+	./modules/miscutil/bin/dbexec < $(srcdir)/modules/miscutil/sql/tabdrop.sql
+	./modules/miscutil/bin/dbexec < $(srcdir)/modules/miscutil/sql/tabcreate.sql
 	./modules/miscutil/bin/dbexec < ./modules/miscutil/sql/tabfill.sql
 	echo "TRUNCATE schTASK;" | ${prefix}/bin/dbexec 
 	@echo ""
@@ -172,7 +172,7 @@ drop-demo-site: install
 	@echo "***************************************************************"
 
 remove-demo-records: install
-	./modules/miscutil/bin/dbexec < ./modules/miscutil/sql/tabbibclean.sql
+	./modules/miscutil/bin/dbexec < $(srcdir)/modules/miscutil/sql/tabbibclean.sql
 	echo "TRUNCATE schTASK;" | ${prefix}/bin/dbexec 
 	@echo ""
 	@echo "***********************************************************************"

diff --git a/configure.ac b/configure.ac
@@ -82,6 +82,9 @@ if test -z "$WML"; then
    Available from <http://www.engelschall.com/sw/wml/>.])
 fi
 
+## Set option -c in WML so that it can work from a separate build tree
+WML="${WML} -c"
+
 ## Check for MySQL client:
 AC_PATH_PROG(MYSQL, mysql)
 if test -z "$MYSQL"; then
@@ -107,7 +110,7 @@ fi
 
 ## Check for Python version and modules:
 AC_MSG_CHECKING(for required Python modules)
-$PYTHON configure-tests.py
+$PYTHON ${srcdir}/configure-tests.py
 if test $? -ne 0; then
    AC_MSG_ERROR([Please fix the above Python problems before continuing.])
 fi
@@ -477,6 +480,12 @@ AC_CONFIG_FILES([Makefile \
 	  modules/miscutil/sql/Makefile \
 	  ])
 
+AC_CONFIG_COMMANDS(.wmlrc, [
+cat<<EOF>.wmlrc
+-Iconfig -I${srcdir}/config
+EOF
+])
+
 ## Finally, write output files:
 AC_OUTPUT
 

diff --git a/modules/bibconvert/bin/Makefile.am b/modules/bibconvert/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp bibconvertc
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibconvert/doc/admin/Makefile.am b/modules/bibconvert/doc/admin/Makefile.am
@@ -28,5 +28,5 @@ EXTRA_DIST = $(wildcard *.wml) $(sample_DATA)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibedit/doc/admin/Makefile.am b/modules/bibedit/doc/admin/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibedit/lib/Makefile.am b/modules/bibedit/lib/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(pylib_DATA) *~ *.tmp *.pyc
 
-%.py: %.py.wml ../../../config/config.wml ../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibformat/bin/Makefile.am b/modules/bibformat/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp 
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibformat/doc/admin/Makefile.am b/modules/bibformat/doc/admin/Makefile.am
@@ -26,5 +26,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibformat/lib/common/Makefile.am b/modules/bibformat/lib/common/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(wildcard *.php) *~ *.tmp
 
-%.php: %.php.wml ../../../../config/config.wml ../../../../config/configbis.wml ../../../../config/cdspage.wml
+%.php: %.php.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibformat/lib/core/Makefile.am b/modules/bibformat/lib/core/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(wildcard *.php) *~ *.tmp
 
-%.php: %.php.wml ../../../../config/config.wml ../../../../config/configbis.wml ../../../../config/cdspage.wml
+%.php: %.php.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibformat/web/Makefile.am b/modules/bibformat/web/Makefile.am
@@ -28,5 +28,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(wildcard *.php) *~ *.tmp
 
-%.php: %.php.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdspage.wml
+%.php: %.php.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibformat/web/admin/Makefile.am b/modules/bibformat/web/admin/Makefile.am
@@ -26,5 +26,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(wildcard *.php) *~ *.tmp
 
-%.php: %.php.wml ../../../../config/config.wml ../../../../config/configbis.wml ../../../../config/cdspage.wml ../../../../config/cdsnavbar.wml
+%.php: %.php.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml $(top_srcdir)/config/cdsnavbar.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibharvest/bin/Makefile.am b/modules/bibharvest/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp bibharvestc
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibharvest/doc/admin/Makefile.am b/modules/bibharvest/doc/admin/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibharvest/lib/Makefile.am b/modules/bibharvest/lib/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(pylib_DATA) *~ *.tmp *.pyc
 
-%.py: %.py.wml ../../../config/config.wml ../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibharvest/web/Makefile.am b/modules/bibharvest/web/Makefile.am
@@ -25,9 +25,9 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) $(webapp_DATA) *~ *.tmp search.pyc
 
-%.py: %.py.wml ../../../config/config.wml ../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibindex/bin/Makefile.am b/modules/bibindex/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp bibindexc
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibindex/doc/admin/Makefile.am b/modules/bibindex/doc/admin/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibindex/lib/Makefile.am b/modules/bibindex/lib/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(pylib_DATA) *~ *.tmp *.pyc
 
-%.py: %.py.wml ../../../config/config.wml ../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibindex/web/admin/Makefile.am b/modules/bibindex/web/admin/Makefile.am
@@ -25,8 +25,8 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) $(webapp_DATA) *~ *.tmp search.pyc
 
-%.py: %.py.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibrank/bin/Makefile.am b/modules/bibrank/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp bibrankc bibrankgkbc vectorrankc
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibrank/doc/admin/Makefile.am b/modules/bibrank/doc/admin/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibrank/doc/hacking/Makefile.am b/modules/bibrank/doc/hacking/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibrank/etc/Makefile.am b/modules/bibrank/etc/Makefile.am
@@ -26,8 +26,8 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(wildcard *.kb) $(wildcard *.cfg) *~ *.tmp
 
-%.kb: %.kb.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdspage.wml
+%.kb: %.kb.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml
 	$(WML) -o $@ $<
 
-%.cfg: %.cfg.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdspage.wml
+%.cfg: %.cfg.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibrank/lib/Makefile.am b/modules/bibrank/lib/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(pylib_DATA) *~ *.tmp *.pyc
 
-%.py: %.py.wml ../../../config/config.wml ../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
diff --git a/modules/bibrank/web/admin/Makefile.am b/modules/bibrank/web/admin/Makefile.am
@@ -25,8 +25,8 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(webapp_DATA) *~ *.tmp
 
-%.py: %.py.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibsched/bin/Makefile.am b/modules/bibsched/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp bibtaskexc
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml 
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml 
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibsched/doc/admin/Makefile.am b/modules/bibsched/doc/admin/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/bibupload/bin/Makefile.am b/modules/bibupload/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp 
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/bibupload/doc/admin/Makefile.am b/modules/bibupload/doc/admin/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/miscutil/bin/Makefile.am b/modules/miscutil/bin/Makefile.am
@@ -27,6 +27,6 @@ install-data-local:
 
 CLEANFILES = $(bin_SCRIPTS) $(noinst_SCRIPTS) *~ *.tmp
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/miscutil/demo/Makefile.am b/modules/miscutil/demo/Makefile.am
@@ -23,5 +23,5 @@ EXTRA_DIST = $(wildcard *.wml) demobibdata.xml
 
 CLEANFILES = $(noinst_DATA) *~ *.tmp democfgdata.sql 
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
diff --git a/modules/miscutil/lib/Makefile.am b/modules/miscutil/lib/Makefile.am
@@ -27,10 +27,10 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(pylib_DATA) $(phplib_DATA) *~ *.tmp *.pyc
 
-%.py: %.py.wml ../../../config/config.wml ../../../config/configbis.wml \
-      ../../../config/messages.wml ../../../config/cdswmllib.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \
+      $(top_srcdir)/config/messages.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
 
-%.php: %.php.wml ../../../config/config.wml ../../../config/configbis.wml \
-      ../../../config/messages.wml ../../../config/cdswmllib.wml
+%.php: %.php.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \
+      $(top_srcdir)/config/messages.wml $(top_srcdir)/config/cdswmllib.wml
 	$(WML) -o $@ $<
diff --git a/modules/miscutil/sql/Makefile.am b/modules/miscutil/sql/Makefile.am
@@ -23,5 +23,5 @@ EXTRA_DIST = $(wildcard *.wml) tabcreate.sql tabdrop.sql tabbibclean.sql
 
 CLEANFILES = $(noinst_DATA) *~ *.tmp tabfill.sql
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<
diff --git a/modules/webaccess/bin/Makefile.am b/modules/webaccess/bin/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(bin_SCRIPTS) *~ *.tmp authactionc
 
-%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdswmllib.wml 
+%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdswmllib.wml 
 	$(WML) -o $@ $<
 	chmod u+x $@
diff --git a/modules/webaccess/doc/admin/Makefile.am b/modules/webaccess/doc/admin/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/webaccess/doc/hacking/Makefile.am b/modules/webaccess/doc/hacking/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(doc_DATA) *~ *.tmp
 
-%.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml
+%.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<
diff --git a/modules/webaccess/lib/Makefile.am b/modules/webaccess/lib/Makefile.am
@@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml)
 
 CLEANFILES = $(pylib_DATA) *~ *.tmp *.pyc
 
-%.py: %.py.wml ../../../config/config.wml ../../../config/configbis.wml
+%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml
 	$(WML) -o $@ $<