# HG changeset patch # User hauberg # Date 1159869124 0 # Node ID 94f6074cb42523a18da77534ebd8f427914fdc4e # Parent 3f662c38802c202ab8f085a05fe34057d230d1cc Updated macros to handle --prefix_builtins diff -r 3f662c38802c -r 94f6074cb425 www/Makefile --- a/www/Makefile Tue Oct 03 09:02:42 2006 +0000 +++ b/www/Makefile Tue Oct 03 09:52:04 2006 +0000 @@ -1,5 +1,6 @@ M4 := m4 MACRO_FILE := macros.m4 +M4_OPTIONS := --prefix-builtins HTML_SRC = $(shell find . | grep "\.in") IMG_HTML = $(HTML_SRC:.in=.html) @@ -26,9 +27,11 @@ html: $(IMG_HTML) +doc/f/edit.html: + @echo Skipping edit.html %.html : %.in - $(M4) $(MACRO_FILE) $< > $@ + $(M4) $(M4_OPTIONS) $(MACRO_FILE) $< > $@ clean: @for f in $(IMG_HTML); do \ diff -r 3f662c38802c -r 94f6074cb425 www/macros.m4 --- a/www/macros.m4 Tue Oct 03 09:02:42 2006 +0000 +++ b/www/macros.m4 Tue Oct 03 09:52:04 2006 +0000 @@ -1,85 +1,85 @@ -define(`__GROUP_ID__',`group_id=2888')dnl -define(`__SOURCEFORGE__',`http://sourceforge.net')dnl -define(`__PACKAGE__',`http://prdownloads.sourceforge.net/octave')dnl -define(`__SUMMARY__',`__SOURCEFORGE__/projects/octave/')dnl -define(`__FORUMS__',`__SOURCEFORGE__/forum/?__GROUP_ID__')dnl -define(`__CVS__',`__SOURCEFORGE__/cvs/?__GROUP_ID__')dnl -define(`__DOWNLOAD__',`__SOURCEFORGE__/project/showfiles.php?__GROUP_ID__')dnl -dnl -dnl -dnl -define(`__BASE_ADDRESS__', `esyscmd(/bin/sh ./get-base-address)')dnl -define(`__TEXT_DIR__', `__BASE_ADDRESS__`text/'')dnl -define(`__IMAGE_DIR__', `__BASE_ADDRESS__`images/'')dnl -dnl -dnl -dnl -define(`__LINK__', `ifdef(`__TEXT_MODE__', `', `link="$1"')')dnl -define(`__VLINK__', `ifdef(`__TEXT_MODE__', `', `vlink="$1"')')dnl -define(`__ALINK__', `ifdef(`__TEXT_MODE__', `', `alink="$1"')')dnl -define(`__TEXT__', `ifdef(`__TEXT_MODE__', `', `text="$1"')')dnl -define(`__COLOR__', `ifdef(`__TEXT_MODE__', `', `color="$1"')')dnl -define(`__BGCOLOR__', `ifdef(`__TEXT_MODE__', `', `bgcolor="$1"')')dnl -dnl -define(`__FACE__', `ifdef(`__TEXT_MODE__', `', `face="$1"')')dnl -dnl -dnl -define(`__LINK_COLOR__', `#0050fa')dnl -define(`__VLINK_COLOR__', `#33ccff')dnl -define(`__ALINK_COLOR__', `#ff0000')dnl -define(`__TEXT_COLOR__', `#000000')dnl -define(`__BG_COLOR__', `#ffffff')dnl -dnl -define(`__TITLE_BAR_BG_COLOR__', `#10a0ff')dnl -define(`__TITLE_BAR_FONT_COLOR__', `#ffffff')dnl -define(`__TITLE_BAR_FACE__', `Helvetica')dnl -dnl -ifdef(`__TEXT_MODE__', - `define(`__RULE__', `
')', - `define(`__RULE__', `
')')dnl -dnl -define(`__DOWNLOAD_BG_COLOR__', `#d0e0ff')dnl -define(`__NAV_SELECTED_COLOR__', `#000000')dnl -define(`__NAV_BG_COLOR__', `#ffffff')dnl -dnl -define(`__NAV_FACE__', `Helvetica')dnl -dnl -dnl -dnl -define(`__DEFAULT_LINK_TEXT__', `ifelse($#, 2, `$1://$2', `$3')')dnl -define(`__HTTP__', - ``'__DEFAULT_LINK_TEXT__(`http', $*)`'')dnl -define(`__MAILTO__', - ``'__DEFAULT_LINK_TEXT__(`http', $*)`'')dnl -define(`__FTP__', - ``'__DEFAULT_LINK_TEXT__(`http', $*)`'')dnl -dnl -define(`__OCTAVE_IMAGE__', - ``[$2]'')dnl -dnl -define(`__OCTAVE_TEXT_HTTP__', - ``$2'')dnl -dnl -define(`__OCTAVE_GRAPHICS_HTTP__', - ``$2'')dnl -dnl -ifdef(`__TEXT_MODE__', - `define(`__OCTAVE_HTTP__', `__OCTAVE_TEXT_HTTP__($1, $2)')', - `define(`__OCTAVE_HTTP__', `__OCTAVE_GRAPHICS_HTTP__($1, $2)')')dnl -dnl -dnl -dnl -define(`__OCTAVE_FTP__', - `__FTP__(ftp.octave.org/pub/octave/$1, $2)')dnl -dnl -dnl -dnl -define(`__OCTAVE_TEXT_MODE_GRAPHIC__', - `__OCTAVE_GRAPHICS_HTTP__(images/$1, $2)')dnl -dnl -dnl -dnl -define(`__HTML_HEADER__', `')', + `m4_define(`__RULE__', `
')')m4_dnl +m4_dnl +m4_define(`__DOWNLOAD_BG_COLOR__', `#d0e0ff')m4_dnl +m4_define(`__NAV_SELECTED_COLOR__', `#000000')m4_dnl +m4_define(`__NAV_BG_COLOR__', `#ffffff')m4_dnl +m4_dnl +m4_define(`__NAV_FACE__', `Helvetica')m4_dnl +m4_dnl +m4_dnl +m4_dnl +m4_define(`__DEFAULT_LINK_TEXT__', `ifelse($#, 2, `$1://$2', `$3')')m4_dnl +m4_define(`__HTTP__', + ``'__DEFAULT_LINK_TEXT__(`http', $*)`'')m4_dnl +m4_define(`__MAILTO__', + ``'__DEFAULT_LINK_TEXT__(`http', $*)`'')m4_dnl +m4_define(`__FTP__', + ``'__DEFAULT_LINK_TEXT__(`http', $*)`'')m4_dnl +m4_dnl +m4_define(`__OCTAVE_IMAGE__', + ``[$2]'')m4_dnl +m4_dnl +m4_define(`__OCTAVE_TEXT_HTTP__', + ``$2'')m4_dnl +m4_dnl +m4_define(`__OCTAVE_GRAPHICS_HTTP__', + ``$2'')m4_dnl +m4_dnl +m4_ifdef(`__TEXT_MODE__', + `m4_define(`__OCTAVE_HTTP__', `__OCTAVE_TEXT_HTTP__($1, $2)')', + `m4_define(`__OCTAVE_HTTP__', `__OCTAVE_GRAPHICS_HTTP__($1, $2)')')m4_dnl +m4_dnl +m4_dnl +m4_dnl +m4_define(`__OCTAVE_FTP__', + `__FTP__(ftp.octave.org/pub/octave/$1, $2)')m4_dnl +m4_dnl +m4_dnl +m4_dnl +m4_define(`__OCTAVE_TEXT_MODE_GRAPHIC__', + `__OCTAVE_GRAPHICS_HTTP__(images/$1, $2)')m4_dnl +m4_dnl +m4_dnl +m4_dnl +m4_define(`__HTML_HEADER__', ` @@ -98,11 +98,11 @@

$1

-')dnl -dnl -dnl -dnl -define(`__MENU__', `