From 6a888d052b3c6270fa28587f36c5d55fa502abb9 Mon Sep 17 00:00:00 2001 From: Thimo Neubauer <thimo@dune-project.org> Date: Fri, 22 Apr 2005 19:49:19 +0000 Subject: [PATCH] generate bin/wmlwrap so that a "make" in doc/ doesn't fail miserably if wml is not installed [[Imported from SVN: r1933]] --- bin/.gitignore | 3 ++- bin/{wmlwrap => wmlwrap.in} | 6 +++--- configure.ac | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) rename bin/{wmlwrap => wmlwrap.in} (88%) diff --git a/bin/.gitignore b/bin/.gitignore index 8f0a70867..ac628a0ea 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,4 +1,5 @@ Makefile Makefile.in .deps -semantic.cache \ No newline at end of file +semantic.cache +wmlwrap \ No newline at end of file diff --git a/bin/wmlwrap b/bin/wmlwrap.in similarity index 88% rename from bin/wmlwrap rename to bin/wmlwrap.in index a9af8843d..4779dcc4c 100755 --- a/bin/wmlwrap +++ b/bin/wmlwrap.in @@ -9,7 +9,7 @@ if test x"$DUNEWEBDIR" = x ; then # call wml without tricks - wml $* + @WML@ $* fi # rewrite filenames to absolute pathes @@ -26,8 +26,8 @@ done 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 ) + ( cd $DUNEWEBDIR && @WML@ --nocd -DROOT=$BASEDIR $ARGS ) else # call wml without tricks - wml $* + @WML@ $* fi diff --git a/configure.ac b/configure.ac index f48a5c3ef..da6978314 100644 --- a/configure.ac +++ b/configure.ac @@ -166,5 +166,6 @@ AC_CONFIG_FILES([Makefile doc/doxygen/Makefile m4/Makefile am/Makefile + bin/wmlwrap dune.pc]) AC_OUTPUT -- GitLab