diff --git a/www/Makefile.in b/www/Makefile.in index 0887cb66..369a84a2 100644 --- a/www/Makefile.in +++ b/www/Makefile.in @@ -32,7 +32,7 @@ datarootdir=@datarootdir@ # Where do Remind and Rem2PS executables live? REMIND = $(bindir)/remind REM2PS = $(bindir)/rem2ps - +REM2HTML = $(bindir)/rem2html # If your Web server requires CGI programs to have a .cgi suffix, use # the next line. Otherwise, comment it out CGISUFFIX=.cgi @@ -46,14 +46,9 @@ SEDSCRIPT = -e 's@%CGIDIR%@$(CGIDIR)@g' \ -e 's@%REMIND%@$(REMIND)@g' \ -e 's@%IMAGEBASE%@$(IMAGEBASE)@g' \ -e 's@%REM2PS%@$(REM2PS)@g' \ + -e 's@%REM2HTML%@$(REM2HTML)@g' \ -e 's@cal_dispatch@cal_dispatch$(CGISUFFIX)@g' \ -SEDSCRIPT2 = -e 's@%CGIDIR%@$(CGIDIR)@g' \ - -e 's@%SCRIPTDIR%@$(SCRIPTDIR)@g' \ - -e 's@%REMIND%@$(REMIND)@g' \ - -e 's@%IMAGEBASE%@$(IMAGEBASE)@g' \ - -e 's@%REM2PS%@$(REM2PS)@g' - all: @echo "Edit the Makefile; then type 'make install' to install" @echo "the www server scripts." diff --git a/www/hebhtml b/www/hebhtml index 3d12a9a5..a3672c05 100644 --- a/www/hebhtml +++ b/www/hebhtml @@ -18,7 +18,7 @@ set lastyear iif(lastmon==12, thisyear-1, thisyear) set nextmon mon(nextmon) set lastmon mon(lastmon) BANNER % -REM RUN $REMIND -iHTML=1 -p $DIR/hebdate.rem %m %y | rem2html --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]" --imgbase "%IMAGEBASE%" --stylesheet rem-default.css +REM RUN $REMIND -iHTML=1 -p $DIR/hebdate.rem %m %y | %REM2HTML% --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]" --imgbase "%IMAGEBASE%" --stylesheet rem-default.css EOR else @@ -33,7 +33,7 @@ set lastyear iif(lastmon==12, thisyear-1, thisyear) set nextmon mon(nextmon) set lastmon mon(lastmon) BANNER % -REM RUN $REMIND -iHTML=1 -p $DIR/hebdate.rem %m %y | rem2html --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]" --imgbase "%IMAGEBASE%" --stylesheet rem-default.css +REM RUN $REMIND -iHTML=1 -p $DIR/hebdate.rem %m %y | %REM2HTML% --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]" --imgbase "%IMAGEBASE%" --stylesheet rem-default.css EOR fi