SGML conversion.

diff --git a/Makefile b/Makefile
index f8a3c14758e9afbb617b6814f311f3dc59711bee..113980894c0b525a56706726e0dc2de4ca81f2a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 # Note: When the version changes, you also have to change
 # the RPM spec file and the lsm.
-VERS=2.1
+VERS=2.2
 
 CFLAGS=-O
 LDFLAGS=-s
@@ -16,8 +16,18 @@ cstrings: cstrings.l
        mv lex.yy.c cstrings.c
        $(CC) $(CFLAGS) cstrings.c $(LDFLAGS) -o cstrings
 
+cstrings.1: cstrings.sgml
+       docbook2man cstrings.sgml
+
+install: cstrings.1 uninstall
+       cp cstrings /usr/bin
+       cp cstrings.1 /usr/share/man/man1/cstrings.1
+
+uninstall:
+       rm -f /usr/bin/cstrings /usr/share/man/man1/cstrings.1
+
 clean:
-       rm -f lex.yy.c cstrings cstrings.c *~ cstrings.shar cstrings.tar.gz
+       rm -f lex.yy.c cstrings cstrings.1 cstrings.c *~ cstrings.tar.gz
        rm -f *.rpm cstrings-*.tar.gz
 
 SOURCES = READ.ME cstrings.1 Makefile cstrings.l cstrings.lsm cstrings.spec
@@ -28,9 +38,6 @@ cstrings-$(VERS).tar.gz: $(SOURCES)
        (cd ..; tar -czvf cstrings/cstrings-$(VERS).tar.gz `cat cstrings/MANIFEST`)
        @(cd ..; rm cstrings-$(VERS))
 
-cstrings-$(VERS).shar:
-       shar $(SOURCES) >cstrings-$(VERS).shar
-
 dist: cstrings-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat

diff --git a/cstrings.spec b/cstrings.spec
index 1fd639c22cf48da1e8b6f0fc3cce4b17dddb2cde..ab500f5f4449be5e9b8f30bb8888046a9fcde81d 100644 (file)
--- a/cstrings.spec
+++ b/cstrings.spec
@@ -1,7 +1,7 @@
 Name: cstrings 
-Version: 2.1
+Version: 2.2
 Release: 1
-Source: locke.ccil.org:/pub/esr/cstrings-2.1.tar.gz
+Source: locke.ccil.org:/pub/esr/cstrings-2.2.tar.gz
 Copyright: BSD-like
 Group: Development/Tools
 Summary: quick-and-dirty C code internationalization tool
@@ -16,9 +16,7 @@ Quick-and-dirty C code internationalization tool.
 make
 
 %install
-rm -f /usr/bin/cstrings
-cp cstrings /usr/bin
-cp cstrings.1 /usr/man/man1/cstrings.1
+make install
 
 %files
 /usr/man/man1/cstrings.1