From 1e872f1a1624161d1b4ae3162e3e77ed18e7ba2a Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Wed, 13 May 2009 19:12:02 +0000
Subject: [PATCH] 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 | 16 +++++++++-------
bin/wmlwrap.in | 33 ---------------------------------
configure.ac | 2 --
3 files changed, 9 insertions(+), 42 deletions(-)
delete mode 100755 bin/wmlwrap.in
diff --git a/am/webstuff b/am/webstuff
index eac7e7956..11ddf6221 100644
--- a/am/webstuff
+++ b/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
diff --git a/bin/wmlwrap.in b/bin/wmlwrap.in
deleted file mode 100755
index 39f8b79e0..000000000
--- a/bin/wmlwrap.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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
diff --git a/configure.ac b/configure.ac
index 6afa5b6d6..b3b240544 100644
--- a/configure.ac
+++ b/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
--
GitLab