From cfbcd08b31b7f7df7ec1f3dee5bf07c7ebfc211e Mon Sep 17 00:00:00 2001 From: Tibor Simko Date: Thu, 15 Jul 2004 18:36:09 +0000 Subject: [PATCH] Patch from Frederic be able to build CDSware out of its source tree. --- Makefile.am | 18 +++++++++--------- configure.ac | 11 ++++++++++- modules/bibconvert/bin/Makefile.am | 2 +- modules/bibconvert/doc/admin/Makefile.am | 2 +- modules/bibedit/doc/admin/Makefile.am | 2 +- modules/bibedit/lib/Makefile.am | 2 +- modules/bibformat/bin/Makefile.am | 2 +- modules/bibformat/doc/admin/Makefile.am | 2 +- modules/bibformat/lib/common/Makefile.am | 2 +- modules/bibformat/lib/core/Makefile.am | 2 +- modules/bibformat/web/Makefile.am | 2 +- modules/bibformat/web/admin/Makefile.am | 2 +- modules/bibharvest/bin/Makefile.am | 2 +- modules/bibharvest/doc/admin/Makefile.am | 2 +- modules/bibharvest/lib/Makefile.am | 2 +- modules/bibharvest/web/Makefile.am | 4 ++-- modules/bibindex/bin/Makefile.am | 2 +- modules/bibindex/doc/admin/Makefile.am | 2 +- modules/bibindex/lib/Makefile.am | 2 +- modules/bibindex/web/admin/Makefile.am | 4 ++-- modules/bibrank/bin/Makefile.am | 2 +- modules/bibrank/doc/admin/Makefile.am | 2 +- modules/bibrank/doc/hacking/Makefile.am | 2 +- modules/bibrank/etc/Makefile.am | 4 ++-- modules/bibrank/lib/Makefile.am | 2 +- modules/bibrank/web/admin/Makefile.am | 4 ++-- modules/bibsched/bin/Makefile.am | 2 +- modules/bibsched/doc/admin/Makefile.am | 2 +- modules/bibupload/bin/Makefile.am | 2 +- modules/bibupload/doc/admin/Makefile.am | 2 +- modules/miscutil/bin/Makefile.am | 2 +- modules/miscutil/demo/Makefile.am | 2 +- modules/miscutil/lib/Makefile.am | 8 ++++---- modules/miscutil/sql/Makefile.am | 2 +- modules/webaccess/bin/Makefile.am | 2 +- modules/webaccess/doc/admin/Makefile.am | 2 +- modules/webaccess/doc/hacking/Makefile.am | 2 +- modules/webaccess/lib/Makefile.am | 2 +- modules/webaccess/web/admin/Makefile.am | 4 ++-- modules/webalert/bin/Makefile.am | 4 ++-- modules/webalert/doc/admin/Makefile.am | 2 +- modules/webalert/lib/Makefile.am | 2 +- modules/webalert/web/Makefile.am | 2 +- modules/webbasket/doc/admin/Makefile.am | 2 +- modules/webbasket/lib/Makefile.am | 2 +- modules/webbasket/web/Makefile.am | 2 +- modules/webhelp/web/Makefile.am | 4 ++-- modules/webhelp/web/admin/Makefile.am | 4 ++-- modules/webhelp/web/admin/howto/Makefile.am | 2 +- modules/webhelp/web/hacking/Makefile.am | 2 +- modules/websearch/bin/Makefile.am | 4 ++-- modules/websearch/doc/Makefile.am | 4 ++-- modules/websearch/doc/admin/Makefile.am | 2 +- modules/websearch/doc/hacking/Makefile.am | 2 +- modules/websearch/lib/Makefile.am | 2 +- modules/websearch/web/Makefile.am | 4 ++-- modules/websearch/web/admin/Makefile.am | 4 ++-- modules/websession/bin/Makefile.am | 2 +- modules/websession/doc/admin/Makefile.am | 2 +- modules/websession/lib/Makefile.am | 2 +- modules/websession/web/Makefile.am | 2 +- modules/webstyle/css/Makefile.am | 2 +- modules/webstyle/doc/admin/Makefile.am | 2 +- modules/webstyle/lib/Makefile.am | 2 +- modules/websubmit/bin/Makefile.am | 2 +- modules/websubmit/doc/Makefile.am | 4 ++-- modules/websubmit/doc/admin/Makefile.am | 4 ++-- .../websubmit/etc/bibconvert/KB/Makefile.am | 2 +- .../etc/bibconvert/config/Makefile.am | 2 +- modules/websubmit/lib/Makefile.am | 2 +- modules/websubmit/lib/functions/Makefile.am | 2 +- modules/websubmit/web/Makefile.am | 2 +- modules/websubmit/web/admin/Makefile.am | 8 ++++---- 73 files changed, 110 insertions(+), 101 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0d12bcfb0f..d760504834 100644 --- 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 index ebe7fc9336..190f43d2ca 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,9 @@ if test -z "$WML"; then Available from .]) 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<.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 index 1916cd469d..f84f948f44 100644 --- 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 $@ \ No newline at end of file diff --git a/modules/bibconvert/doc/admin/Makefile.am b/modules/bibconvert/doc/admin/Makefile.am index 84dfc660a1..50ef11e2a2 100644 --- 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 index c2b6ac0b73..a424e8220c 100644 --- 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 index fa0c55cf67..19213dddc7 100644 --- 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 index ec0a698895..16d4158f07 100644 --- 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 index 72454af621..ba32bfea69 100644 --- 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:$@ $< \ No newline at end of file diff --git a/modules/bibformat/lib/common/Makefile.am b/modules/bibformat/lib/common/Makefile.am index 1a27d11dd5..8d8462a962 100644 --- 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 index 3c6a074606..b2d5176066 100644 --- 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 index 58a636d07f..49fa84fe67 100644 --- 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 index a95cd7cee4..13797de689 100644 --- 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 index 0ac8f39eef..592f028d67 100644 --- 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 $@ \ No newline at end of file diff --git a/modules/bibharvest/doc/admin/Makefile.am b/modules/bibharvest/doc/admin/Makefile.am index d94beda9d7..c1156b53c1 100644 --- 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:$@ $< \ No newline at end of file diff --git a/modules/bibharvest/lib/Makefile.am b/modules/bibharvest/lib/Makefile.am index 036d39c7bc..e5e7c44d2c 100644 --- 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 $@ $< \ No newline at end of file diff --git a/modules/bibharvest/web/Makefile.am b/modules/bibharvest/web/Makefile.am index d015c43e5e..0f7f33b265 100644 --- 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 index b4d1b38c53..7141ffd34d 100644 --- 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 $@ \ No newline at end of file diff --git a/modules/bibindex/doc/admin/Makefile.am b/modules/bibindex/doc/admin/Makefile.am index 15d40da418..7d70c92fe3 100644 --- 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 index c5edd4af15..e61b5ac21f 100644 --- 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 index 566287cfb0..bd05ba455f 100644 --- 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 index 719c647361..8f02d31f54 100644 --- 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 index 5ec00f804f..af91bbe6a2 100644 --- 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 index 5eddba9e5f..9343809ee8 100644 --- 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 index d456111293..a58b45646b 100644 --- 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 index e028c8a9d3..fe6012d989 100644 --- 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 index 6c624f7046..b99331ce64 100644 --- 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:$@ $< \ No newline at end of file diff --git a/modules/bibsched/bin/Makefile.am b/modules/bibsched/bin/Makefile.am index 547e0a1bcb..eee2052947 100644 --- 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 $@ \ No newline at end of file diff --git a/modules/bibsched/doc/admin/Makefile.am b/modules/bibsched/doc/admin/Makefile.am index 66c5d40fd6..98f98f7f2b 100644 --- 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:$@ $< \ No newline at end of file diff --git a/modules/bibupload/bin/Makefile.am b/modules/bibupload/bin/Makefile.am index 1666287be1..d120da27c3 100644 --- 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 index 5dcf10f2cb..13d200c64a 100644 --- 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 index d29fb750ff..203f83b3c8 100644 --- 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 $@ \ No newline at end of file diff --git a/modules/miscutil/demo/Makefile.am b/modules/miscutil/demo/Makefile.am index 1cfc1409b7..e98cec0172 100644 --- 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 $@ $< \ No newline at end of file diff --git a/modules/miscutil/lib/Makefile.am b/modules/miscutil/lib/Makefile.am index 26a67347bc..d31f5632e7 100644 --- 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 $@ $< \ No newline at end of file diff --git a/modules/miscutil/sql/Makefile.am b/modules/miscutil/sql/Makefile.am index 0606d0df23..a5ec7cefaf 100644 --- 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 $@ $< \ No newline at end of file diff --git a/modules/webaccess/bin/Makefile.am b/modules/webaccess/bin/Makefile.am index e7f42c8027..18dde1b568 100644 --- 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 index be147a96fa..e2d72a45aa 100644 --- 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:$@ $< \ No newline at end of file diff --git a/modules/webaccess/doc/hacking/Makefile.am b/modules/webaccess/doc/hacking/Makefile.am index 426dfa4170..2e85fcdb1c 100644 --- 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:$@ $< \ No newline at end of file diff --git a/modules/webaccess/lib/Makefile.am b/modules/webaccess/lib/Makefile.am index 28fe55adbe..c450a60c07 100644 --- 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 $@ $< \ No newline at end of file diff --git a/modules/webaccess/web/admin/Makefile.am b/modules/webaccess/web/admin/Makefile.am index f2b23de9c7..b6518e732f 100644 --- a/modules/webaccess/web/admin/Makefile.am +++ b/modules/webaccess/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:$@ $< \ No newline at end of file diff --git a/modules/webalert/bin/Makefile.am b/modules/webalert/bin/Makefile.am index d839095c97..79fd128e3d 100644 --- a/modules/webalert/bin/Makefile.am +++ b/modules/webalert/bin/Makefile.am @@ -23,9 +23,9 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(bin_SCRIPTS) *~ *.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 $@ $< -%: %.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 $@ \ No newline at end of file diff --git a/modules/webalert/doc/admin/Makefile.am b/modules/webalert/doc/admin/Makefile.am index 6a81a91106..8bc2f4c4c4 100644 --- a/modules/webalert/doc/admin/Makefile.am +++ b/modules/webalert/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:$@ $< \ No newline at end of file diff --git a/modules/webalert/lib/Makefile.am b/modules/webalert/lib/Makefile.am index 7f43e3fa67..7775e261ca 100644 --- a/modules/webalert/lib/Makefile.am +++ b/modules/webalert/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 $@ $< \ No newline at end of file diff --git a/modules/webalert/web/Makefile.am b/modules/webalert/web/Makefile.am index 93eae6f146..661680ecaf 100644 --- a/modules/webalert/web/Makefile.am +++ b/modules/webalert/web/Makefile.am @@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(webapp_DATA) *~ *.tmp -%: %.wml ../../../config/config.wml ../../../config/configbis.wml +%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(WML) -o $@ $< diff --git a/modules/webbasket/doc/admin/Makefile.am b/modules/webbasket/doc/admin/Makefile.am index 8cae94e6a2..10a5509924 100644 --- a/modules/webbasket/doc/admin/Makefile.am +++ b/modules/webbasket/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:$@ $< \ No newline at end of file diff --git a/modules/webbasket/lib/Makefile.am b/modules/webbasket/lib/Makefile.am index 69a607f28a..2bd0ccb875 100644 --- a/modules/webbasket/lib/Makefile.am +++ b/modules/webbasket/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 $@ $< \ No newline at end of file diff --git a/modules/webbasket/web/Makefile.am b/modules/webbasket/web/Makefile.am index d1310c95bc..744a715397 100644 --- a/modules/webbasket/web/Makefile.am +++ b/modules/webbasket/web/Makefile.am @@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(webapp_DATA) *~ *.tmp -%: %.wml ../../../config/config.wml ../../../config/configbis.wml +%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(WML) -o $@ $< diff --git a/modules/webhelp/web/Makefile.am b/modules/webhelp/web/Makefile.am index 05a976f5d3..c31c07abca 100644 --- a/modules/webhelp/web/Makefile.am +++ b/modules/webhelp/web/Makefile.am @@ -27,8 +27,8 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(doc_DATA) *~ *.tmp -%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml ../../../config/config.wml ../../../config/configbis.wml \ - ../../../config/messages.wml +%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \ + $(top_srcdir)/config/messages.wml $(WML) -o\(ALL-LANG_*\)+LANG_EN:$*.en.html \ -o\(ALL-LANG_*\)+LANG_FR:$*.fr.html \ -o\(ALL-LANG_*\)+LANG_DE:$*.de.html \ diff --git a/modules/webhelp/web/admin/Makefile.am b/modules/webhelp/web/admin/Makefile.am index 007700fd5b..a6e6b80d40 100644 --- a/modules/webhelp/web/admin/Makefile.am +++ b/modules/webhelp/web/admin/Makefile.am @@ -27,8 +27,8 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(doc_DATA) *~ *.tmp -%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml \ - ../../../../config/messages.wml +%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \ + $(top_srcdir)/config/messages.wml $(WML) -o\(ALL-LANG_*\)+LANG_EN:$*.en.html \ -o\(ALL-LANG_*\)+LANG_FR:$*.fr.html \ -o\(ALL-LANG_*\)+LANG_DE:$*.de.html \ diff --git a/modules/webhelp/web/admin/howto/Makefile.am b/modules/webhelp/web/admin/howto/Makefile.am index 7a57e7fa06..bc9d26a152 100644 --- a/modules/webhelp/web/admin/howto/Makefile.am +++ b/modules/webhelp/web/admin/howto/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:$@ $< \ No newline at end of file diff --git a/modules/webhelp/web/hacking/Makefile.am b/modules/webhelp/web/hacking/Makefile.am index 7537899356..236cfa8717 100644 --- a/modules/webhelp/web/hacking/Makefile.am +++ b/modules/webhelp/web/hacking/Makefile.am @@ -28,5 +28,5 @@ EXTRA_DIST = $(wildcard *.wml) $(wildcard *.el) $(wildcard *.jpeg) CLEANFILES = $(wildcard *.html) *~ *.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:$@ $< \ No newline at end of file diff --git a/modules/websearch/bin/Makefile.am b/modules/websearch/bin/Makefile.am index 9507c4f21d..da68fee335 100644 --- a/modules/websearch/bin/Makefile.am +++ b/modules/websearch/bin/Makefile.am @@ -23,9 +23,9 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(bin_SCRIPTS) *~ *.tmp index.wml -%.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 ../../../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/websearch/doc/Makefile.am b/modules/websearch/doc/Makefile.am index f185b9b248..8a6ffe2920 100644 --- a/modules/websearch/doc/Makefile.am +++ b/modules/websearch/doc/Makefile.am @@ -28,8 +28,8 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(doc_DATA) *~ *.tmp -%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml ../../../config/config.wml ../../../config/configbis.wml \ - ../../../config/messages.wml +%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \ + $(top_srcdir)/config/messages.wml $(WML) -o\(ALL-LANG_*\)+LANG_EN:$*.en.html \ -o\(ALL-LANG_*\)+LANG_FR:$*.fr.html \ -o\(ALL-LANG_*\)+LANG_DE:$*.de.html \ diff --git a/modules/websearch/doc/admin/Makefile.am b/modules/websearch/doc/admin/Makefile.am index 53fb69c78d..cedcbd8b93 100644 --- a/modules/websearch/doc/admin/Makefile.am +++ b/modules/websearch/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/websearch/doc/hacking/Makefile.am b/modules/websearch/doc/hacking/Makefile.am index 8caeda5ff1..4df10bf2b3 100644 --- a/modules/websearch/doc/hacking/Makefile.am +++ b/modules/websearch/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:$@ $< \ No newline at end of file diff --git a/modules/websearch/lib/Makefile.am b/modules/websearch/lib/Makefile.am index d94f384249..602964acd9 100644 --- a/modules/websearch/lib/Makefile.am +++ b/modules/websearch/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/websearch/web/Makefile.am b/modules/websearch/web/Makefile.am index ab53e3722f..d1c15801e2 100644 --- a/modules/websearch/web/Makefile.am +++ b/modules/websearch/web/Makefile.am @@ -27,9 +27,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/websearch/web/admin/Makefile.am b/modules/websearch/web/admin/Makefile.am index 4ffc528171..065818039f 100644 --- a/modules/websearch/web/admin/Makefile.am +++ b/modules/websearch/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/websession/bin/Makefile.am b/modules/websession/bin/Makefile.am index c99757f9d5..6baaed666c 100644 --- a/modules/websession/bin/Makefile.am +++ b/modules/websession/bin/Makefile.am @@ -23,6 +23,6 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(bin_SCRIPTS) *~ *.tmp sessiongcc -%: %.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 $@ \ No newline at end of file diff --git a/modules/websession/doc/admin/Makefile.am b/modules/websession/doc/admin/Makefile.am index d56fca1364..0cd0c038b5 100644 --- a/modules/websession/doc/admin/Makefile.am +++ b/modules/websession/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:$@ $< \ No newline at end of file diff --git a/modules/websession/lib/Makefile.am b/modules/websession/lib/Makefile.am index e85b64acfc..26468dbade 100644 --- a/modules/websession/lib/Makefile.am +++ b/modules/websession/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 $@ $< \ No newline at end of file diff --git a/modules/websession/web/Makefile.am b/modules/websession/web/Makefile.am index b1c42d593f..c19037acc3 100644 --- a/modules/websession/web/Makefile.am +++ b/modules/websession/web/Makefile.am @@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(webapp_DATA) *~ *.tmp -%: %.wml ../../../config/config.wml ../../../config/configbis.wml +%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(WML) -o $@ $< diff --git a/modules/webstyle/css/Makefile.am b/modules/webstyle/css/Makefile.am index 6184ed295e..318e02575d 100644 --- a/modules/webstyle/css/Makefile.am +++ b/modules/webstyle/css/Makefile.am @@ -24,5 +24,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(web_DATA) *~ *.tmp -%: %.wml ../../../config/config.wml ../../../config/configbis.wml ../../../config/cdspage.wml +%: %.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml $(WML) -o $@ $< diff --git a/modules/webstyle/doc/admin/Makefile.am b/modules/webstyle/doc/admin/Makefile.am index 99f99b39b1..cd60dacc98 100644 --- a/modules/webstyle/doc/admin/Makefile.am +++ b/modules/webstyle/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:$@ $< \ No newline at end of file diff --git a/modules/webstyle/lib/Makefile.am b/modules/webstyle/lib/Makefile.am index 02a647e826..958aebde29 100644 --- a/modules/webstyle/lib/Makefile.am +++ b/modules/webstyle/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 $@ $< \ No newline at end of file diff --git a/modules/websubmit/bin/Makefile.am b/modules/websubmit/bin/Makefile.am index 2399ec9c39..0235e15395 100644 --- a/modules/websubmit/bin/Makefile.am +++ b/modules/websubmit/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 $@ \ No newline at end of file diff --git a/modules/websubmit/doc/Makefile.am b/modules/websubmit/doc/Makefile.am index 2089d47b3a..2707008565 100644 --- a/modules/websubmit/doc/Makefile.am +++ b/modules/websubmit/doc/Makefile.am @@ -42,8 +42,8 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(doc_DATA) *~ *.tmp *.php -%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml ../../../config/config.wml ../../../config/configbis.wml \ - ../../../config/messages.wml +%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \ + $(top_srcdir)/config/messages.wml $(WML) -o\(ALL-LANG_*\)+LANG_EN:$*.en.html \ -o\(ALL-LANG_*\)+LANG_FR:$*.fr.html \ -o\(ALL-LANG_*\)+LANG_DE:$*.de.html \ diff --git a/modules/websubmit/doc/admin/Makefile.am b/modules/websubmit/doc/admin/Makefile.am index b8160ce07c..6b22241224 100644 --- a/modules/websubmit/doc/admin/Makefile.am +++ b/modules/websubmit/doc/admin/Makefile.am @@ -47,8 +47,8 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(doc_DATA) *~ *.tmp *.php -%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml ../../../../config/config.wml ../../../../config/configbis.wml \ - ../../../../config/messages.wml +%.en.html %.fr.html %.de.html %.es.html %.pt.html %.it.html %.ru.html %.sk.html %.cz.html %.no.html %.se.html: %.html.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \ + $(top_srcdir)/config/messages.wml $(WML) -o\(ALL-LANG_*\)+LANG_EN:$*.en.html \ -o\(ALL-LANG_*\)+LANG_FR:$*.fr.html \ -o\(ALL-LANG_*\)+LANG_DE:$*.de.html \ diff --git a/modules/websubmit/etc/bibconvert/KB/Makefile.am b/modules/websubmit/etc/bibconvert/KB/Makefile.am index 28787324cc..7f30412ced 100644 --- a/modules/websubmit/etc/bibconvert/KB/Makefile.am +++ b/modules/websubmit/etc/bibconvert/KB/Makefile.am @@ -26,5 +26,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(wildcard *.KB) *~ *.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 $@ $< diff --git a/modules/websubmit/etc/bibconvert/config/Makefile.am b/modules/websubmit/etc/bibconvert/config/Makefile.am index 792e44b3c5..778fa8686e 100644 --- a/modules/websubmit/etc/bibconvert/config/Makefile.am +++ b/modules/websubmit/etc/bibconvert/config/Makefile.am @@ -26,5 +26,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(wildcard *.tpl) *~ *.tmp -%.tpl: %.tpl.wml ../../../../../config/config.wml ../../../../../config/configbis.wml ../../../../../config/cdspage.wml +%.tpl: %.tpl.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml $(WML) -o $@ $< diff --git a/modules/websubmit/lib/Makefile.am b/modules/websubmit/lib/Makefile.am index 85ec4345ae..8ab56f2585 100644 --- a/modules/websubmit/lib/Makefile.am +++ b/modules/websubmit/lib/Makefile.am @@ -27,5 +27,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(wildcard *.php) *~ *.tmp *.php *.py -%.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/websubmit/lib/functions/Makefile.am b/modules/websubmit/lib/functions/Makefile.am index 80c95eedb6..d589feb294 100644 --- a/modules/websubmit/lib/functions/Makefile.am +++ b/modules/websubmit/lib/functions/Makefile.am @@ -25,5 +25,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(wildcard *.php) $(wildcard *.py) *~ *.tmp -%.py: %.py.wml ../../../../config/config.wml ../../../../config/configbis.wml ../../../../config/cdspage.wml +%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml $(top_srcdir)/config/cdspage.wml $(WML) -o $@ $< diff --git a/modules/websubmit/web/Makefile.am b/modules/websubmit/web/Makefile.am index f4c8c2d380..9f0035c8e1 100644 --- a/modules/websubmit/web/Makefile.am +++ b/modules/websubmit/web/Makefile.am @@ -27,5 +27,5 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(doc_DATA) *~ *.tmp *.php *.html -%.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/websubmit/web/admin/Makefile.am b/modules/websubmit/web/admin/Makefile.am index 34059d894a..7e8e094221 100644 --- a/modules/websubmit/web/admin/Makefile.am +++ b/modules/websubmit/web/admin/Makefile.am @@ -26,9 +26,9 @@ EXTRA_DIST = $(wildcard *.wml) CLEANFILES = $(webapp_DATA) *~ *.tmp -%.php: %.php.wml ../../../../config/config.wml ../../../../config/configbis.wml \ - ../../../../config/messages.wml +%.php: %.php.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \ + $(top_srcdir)/config/messages.wml $(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $< -%.py: %.py.wml ../../../../config/config.wml ../../../../config/configbis.wml \ - ../../../../config/messages.wml +%.py: %.py.wml $(top_srcdir)/config/config.wml $(top_builddir)/config/configbis.wml \ + $(top_srcdir)/config/messages.wml $(WML) -o\(ALL-LANG_*\)+LANG_EN:$@ $<