wmlwrap isn't needed anymore

* update am/webstuff with new rules, which work without wmlwrap
* this should also fix out-of-source doc generation (although untested)

[[Imported from SVN: r5525]]

am/webstuff

@@ -9,15 +9,18 @@
 
 # CURDIR should be defined in the same way as in dune-web
 
-# pass files through wrapper
-# pass variables to wmlwrap via environment
-if WML
+if DUNEWEB
+WMLCMD = cd $(DUNEWEBDIR) && @WML@ --nocd -DROOT=$(BASEDIR)
+else
+WMLCMD = @WML@
+endif
 
+if WML
 .wml.html:
-	export DUNEWEBDIR=$(DUNEWEBDIR); \
-	export BASEDIR=$(BASEDIR); \
-	sh $(DUNE_COMMON_ROOT)/bin/wmlwrap -I $(srcdir) $< -o $@
+	$(WMLCMD) -I $(abs_srcdir) $(abs_builddir)/$< -o $(abs_builddir)/$@
+endif
 
+if DUNEWEB
 web-install-default: all
 	if test -d $(DUNEWEBDIR) && test -r $(DUNEWEBDIR)/Make.global ; then \
 	  for DIR in $(SUBDIRS) ; do \
@@ -26,7 +29,6 @@ web-install-default: all
 	  $(MAKE) -f $(DUNEWEBDIR)/Make.global \
             EXTRAINSTALL="$(EXTRAINSTALL)" CURDIR="$(CURDIR)" install ; \
 	fi
-
 endif
 
 web-install: web-install-default

bin/wmlwrap.in

-#!/bin/sh
-# $Id$
-
-# script wrapping a call to wml
-# 
-# if the environment-variable DUNEWEBDIR is set to a checked out
-# version of dune-web then wml is called in a way that the real web
-# layout is used
-
-if test x"$DUNEWEBDIR" = x ; then
-    # call wml without tricks
-    @WML@ $*
-fi
-
-# rewrite filenames to absolute pathes
-PWD=`pwd`
-for OPT in $* ; do
-    case "$OPT" in
-	*.wml) ARGS="$ARGS $PWD/$OPT";;
-	*.html) ARGS="$ARGS $PWD/$OPT";;
-	*) ARGS="$ARGS $OPT" ;;
-    esac
-done
-
-# check if DUNEWEBDIR seems correct
-if test -d "$DUNEWEBDIR" && test -r $DUNEWEBDIR/layout/default.wml ; then
-    # call wml from within dune-web
-    # --nocd lets wml use the .wmlrc from dune-web
-    ( cd $DUNEWEBDIR && @WML@ --nocd -DROOT=$BASEDIR $ARGS )
-else
-    # call wml without tricks
-    @WML@ $*
-fi

configure.ac

@@ -34,13 +34,11 @@ AC_CONFIG_FILES([Makefile
      doc/buildsystem/Makefile
      m4/Makefile
      am/Makefile
-     bin/wmlwrap
      bin/check-log-store
      dune-common.pc])
 AC_OUTPUT
 
 # make scripts executable
-chmod +x bin/wmlwrap
 chmod +x bin/check-log-store
 
 # print results