do not remove *.cfm on make clean; do remove .alternately_*

diff --git a/Makefile b/Makefile
index 50badd1e820b6ad7036b615e51648e0582700a02..af43f43b5190b063b05237a45de9c928930bce39 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -121,10 +121,10 @@ interpolate+%.o: interpolate.c
 clean:
                rm -f prime.data $(TARGETS)
                rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
 clean:
                rm -f prime.data $(TARGETS)
                rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~

-               rm -f *.d *.cfm
+               rm -f *.d .alternately_*

 
 realclean:     clean
 
 realclean:     clean

-               rm -f *.CFM
+               rm -f *.cfm *.CFM

 
 %.d:
 
 
 %.d:
 

diff --git a/view-cyclicly b/view-cyclicly
index 34e7087f9b920195ce0eaef2eefc80cd13b1c570..09b2ebc4a7a8bad7a615d34dcd6fb63753d33d32 100755 (executable)
--- a/view-cyclicly
+++ b/view-cyclicly
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 set -e
 if [ $# -lt 3 ]; then
  echo >&2 'usage: view-cyclicly ./view-NN file-NN-a.cfm file-NN-b.cfm...'
 set -e
 if [ $# -lt 3 ]; then
  echo >&2 'usage: view-cyclicly ./view-NN file-NN-a.cfm file-NN-b.cfm...'


@@ -9,7 +9,7 @@ viewer=$1; shift
 
 alt=".alternately"
 for f in "$@"; do
 
 alt=".alternately"
 for f in "$@"; do

-       g="${g//_/__}"
+       g="${f//_/__}"

        g="${g//"/"/_:}"
        alt="${alt}_,$g"
 done
        g="${g//"/"/_:}"
        alt="${alt}_,$g"
 done