Move rem2html into its own directory and install it by default.

Makefile

@@ -18,7 +18,8 @@ install:
 	@echo "*                   *"
 	@echo "*********************"
 	@echo ""
-	@cd src && $(MAKE) install
+	@$(MAKE) -C src install
+	@$(MAKE) -C rem2html install
 
 clean:
 	find . -name '*~' -exec rm {} \;

configure

@@ -626,6 +626,7 @@ VERSION
 EGREP
 GREP
 CPP
+PERL
 SET_MAKE
 LN_S
 INSTALL_DATA
@@ -3274,6 +3275,46 @@ $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 
 
@@ -3993,7 +4034,8 @@ done
 
 VERSION=03.03.08
 
-ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h"
+
+ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4689,6 +4731,7 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "www/Makefile") CONFIG_FILES="$CONFIG_FILES www/Makefile" ;;
     "src/version.h") CONFIG_FILES="$CONFIG_FILES src/version.h" ;;
+    "rem2html/Makefile") CONFIG_FILES="$CONFIG_FILES rem2html/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.in

@@ -49,6 +49,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PATH_PROG([PERL], [perl])
 
 dnl Checks for libraries.
 dnl Replace `main' with a function in -lm:
@@ -77,4 +78,5 @@ fi
 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale)
 VERSION=03.03.08
 AC_SUBST(VERSION)
-AC_OUTPUT(src/Makefile www/Makefile src/version.h)
+AC_SUBST(PERL)
+AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile)

rem2html/Makefile.in

@@ -0,0 +1,27 @@
+# Set by configure - don't touch.
+srcdir=@srcdir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+mandir=@mandir@
+bindir=@bindir@
+datadir=@datadir@
+datarootdir=@datarootdir@
+PERL=@PERL@
+PERLMODS_NEEDED=JSON::Any Getopt::Long
+all:
+	true
+
+install:
+	@for m in $(PERLMODS_NEEDED) ; \
+         do \
+	    perl -M$$m -e 1; \
+	    if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \
+	done; \
+	echo "Installing rem2html in $(DESTDIR)$(bindir)"; \
+	mkdir -p $(DESTDIR)$(bindir) && sed -e 's|^#!perl|#!$(PERL)|' < rem2html > $(DESTDIR)$(bindir)/rem2html && chmod 755 $(DESTDIR)$(bindir)/rem2html && exit 0; \
+	exit 1;
+
+
+
+
+

rem2html/rem2html

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!perl
 
 use strict;
 use warnings;

www/Makefile.in

@@ -4,7 +4,7 @@
 
 # The complete path to where the scripts actually live, as seen by
 # the UNIX operating system.
-SCRIPTDIR = /var/www/cgi-bin
+SCRIPTDIR = /usr/lib/cgi-bin
 
 # Where the scripts live as seen by the web browser.
 CGIDIR = /cgi-bin
@@ -17,7 +17,7 @@ HTMLDIR = /var/www/remind
 # Where you stick images and CSS files, as seen by UNIX
 IMAGEDIR = /var/www/remind/resources
 
-# Where images are, as seen by web browers
+# Where images and CSS fiels are, as seen by web browers
 IMAGEBASE = /remind/resources
 
 # Set by configure - don't touch.
@@ -47,7 +47,6 @@ SEDSCRIPT = -e 's@%CGIDIR%@$(CGIDIR)@g' \
 	    -e 's@%IMAGEBASE%@$(IMAGEBASE)@g' \
 	    -e 's@%REM2PS%@$(REM2PS)@g' \
 	    -e 's@cal_dispatch@cal_dispatch$(CGISUFFIX)@g' \
-	    -e 's@rem2html@rem2html$(CGISUFFIX)@g'
 
 SEDSCRIPT2 = -e 's@%CGIDIR%@$(CGIDIR)@g' \
 	     -e 's@%SCRIPTDIR%@$(SCRIPTDIR)@g' \
@@ -72,7 +71,6 @@ install:
 	cp blank.rem $(DESTDIR)$(SCRIPTDIR)/blank.rem
 	sed $(SEDSCRIPT)  < calendar.html-DIST > $(DESTDIR)$(HTMLDIR)/calendar.html
 	sed $(SEDSCRIPT)  < hebhtml  > $(DESTDIR)$(SCRIPTDIR)/hebhtml
-	sed $(SEDSCRIPT2) < rem2html > $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/sunrise.rem
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/moon.rem
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/hebdate.rem
@@ -80,12 +78,10 @@ install:
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/blank.rem
 	chmod 644 $(DESTDIR)$(HTMLDIR)/calendar.html
 	chmod 755 $(DESTDIR)$(SCRIPTDIR)/cal_dispatch$(CGISUFFIX)
-	chmod 755 $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)
 	chmod 755 $(DESTDIR)$(SCRIPTDIR)/calps $(DESTDIR)$(SCRIPTDIR)/hebdate \
 	$(DESTDIR)$(SCRIPTDIR)/hebps $(DESTDIR)$(SCRIPTDIR)/moon \
 	$(DESTDIR)$(SCRIPTDIR)/sunrise $(DESTDIR)$(SCRIPTDIR)/sunset \
         $(DESTDIR)$(SCRIPTDIR)/hebhtml \
-        $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)
 
 	-mkdir -p $(DESTDIR)$(IMAGEDIR)
 	cp rem-default.css $(DESTDIR)$(IMAGEDIR)

www/README

@@ -19,9 +19,7 @@ server:
 1) Edit the Makefile in this directory.  See the comments in the Makefile
    for details.
 
-2) Edit the first line of "rem2html" to reflect the location of
-   Perl on your system. (Oh yeah, you need Perl for the
-   HTML Hebrew calendar...)
+2) Make sure "rem2html" is installed.
 
 3) Type "make install"
 

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 | $DIR/rem2html --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]"
+REM RUN $REMIND -iHTML=1 -p $DIR/hebdate.rem %m %y | rem2html --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]"
 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 | $DIR/rem2html --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]"
+REM RUN $REMIND -iHTML=1 -p $DIR/hebdate.rem %m %y | rem2html --forwurl "cal_dispatch?hebhtml+[nextmon]+[nextyear]" --backurl "cal_dispatch?hebhtml+[lastmon]+[lastyear]"
 EOR
 
 fi