The 2.7 version.

diff --git a/Makefile b/Makefile
index 509f948b97df7931ffff39bedcc9455a4ac67b71..5fc356abccc599c57657c1b2410a578f8089db23 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,12 @@
 
 # Note: When the version changes, you also have to change
 # the RPM spec file and LSM
-VERS=2.6
+VERS=2.7
 
 CFLAGS = -O
 
-ascii: ascii.o 
-ascii.o: ascii.c splashscreen.h
+ascii: ascii.c splashscreen.h
+       $(CC) -DREVISION=$(VERS) ascii.c -o ascii
 
 splashscreen.h: splashscreen
        sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/' -e 's/.*/P("&");/' 
@@ -15,7 +15,15 @@ splashscreen.h: splashscreen
 clean:
        rm -f ascii ascii.tar* ascii.shar ascii.o splashscreen.h
 
-SOURCES = Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen
+install:
+       cp ascii /usr/bin/ascii
+       cp ascii.1 /usr/man/man1
+
+uninstall:
+       rm /usr/bin/ascii
+       rm /usr/man/man1
+
+SOURCES = README Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen
 
 ascii-$(VERS).tar.gz: $(SOURCES)
        @ls $(SOURCES) | sed s:^:ascii-$(VERS)/: >MANIFEST

diff --git a/ascii.c b/ascii.c
index 3d0eeffa1c05c80a4ba99fc4ba36006d40c14a52..2e92a02d9bac54578e679adf72ca406c5b14957a 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -11,7 +11,8 @@
  *      v2.3 November 1997  -- incorporated Colin Plumb's splash-screen idea.
  *     v2.4 December 1998  -- additions by Brian Ginsbach.
  *     v2.5 December 1998  -- -s option by David N. Welton.
- *      v2.6 June 1999      -- bug fixes by M.R. van Schouwen.
+ *     v2.6 June 1999      -- bug fixes by M.R. van Schouwen.
+ *     v2.7 October 1999   -- minor packaging and option changes.
  *
  * Tries to interpret arguments as names or aliases of ascii characters
  * and dumps out *all* the aliases of each. Accepts literal characters,
@@ -27,9 +28,6 @@
  * your improvements, please.
  */
 
-
-#define REVISION "$Revision: 1.13 $"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -328,7 +326,7 @@ process_options(int argc, char *argv[], char * opt_string)
            help = 1;
            break;
        case 'v':
-           printf("%s\n",REVISION); exit(0) ;
+           printf("ascii %2.1f\n",REVISION); exit(0) ;
            break;
        default :
            help = 1;