XML conversion.

diff --git a/Makefile b/Makefile
index edb283bde6f7f527f5ec516626f19dd08f857b9a..c54e5cddc3be41ac0ac143c71507c206a5496b29 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for the imgsizer distribution
-VERS=2.2
+VERS=2.3
 
 # These choices are correct for Linux.  Season to taste.
 BINDIR = /usr/bin
@@ -13,11 +13,11 @@ uninstall:
        rm -f $(BINDIR)/imgsizer $(BINDIR)/imgsizer $(MANDIR)/imgsizer.1
 
 clean:
-       rm -f imgsizer.1 manpage.links manpage.refs *~ 
+       rm -f imgsizer.1 *~ 
        rm -f imgsizer-*-1.noarch.rpm imgsizer-*-1.noarch.rpm imgsizer-*.tar.gz
 
-imgsizer.1: imgsizer.sgml
-       docbook2man imgsizer.sgml
+imgsizer.1: imgsizer.xml
+       xmlto man imgsizer.xml
 
 install: imgsizer.1 uninstall
        cp imgsizer /usr/bin
@@ -26,10 +26,10 @@ install: imgsizer.1 uninstall
 uninstall:
        rm -f /usr/bin/imgsizer /usr/share/man/man1/imgsizer.1
 
-SOURCES = READ.ME Makefile imgsizer imgsizer.sgml imgsizer.1 imgsizer.lsm  
-imgsizer-$(VERS).tar.gz: $(SOURCES)
+SOURCES = READ.ME Makefile imgsizer imgsizer.xml imgsizer.lsm  
+imgsizer-$(VERS).tar.gz: $(SOURCES) imgsizer.1 
        mkdir imgsizer-$(VERS)
-       cp $(SOURCES) imgsizer-$(VERS)
+       cp $(SOURCES) imgsizer.1 imgsizer-$(VERS)
        tar -czf imgsizer-$(VERS).tar.gz imgsizer-$(VERS)
        rm -fr imgsizer-$(VERS)
        ls -l imgsizer-$(VERS).tar.gz
@@ -39,7 +39,7 @@ dist: imgsizer-$(VERS).tar.gz
 # Make RPMs.  You need to be root to make this work
 RPMROOT=/usr/src/redhat
 RPM = rpm
-RPMFLAGS = -bb --target=noarch
+RPMFLAGS = -bb --target noarch
 rpm: imgsizer-$(VERS).tar.gz
        cp imgsizer-$(VERS).tar.gz $(RPMROOT)/SOURCES;
        cp imgsizer.spec $(RPMROOT)/SPECS/imgsizer.spec

diff --git a/imgsizer.xml b/imgsizer.xml
index 5b9b4863ec85ababf3ee8e862a07b8726b187740..2a0737a55c5dcdaf6f28cf576086dc7e4ba1e3b0 100644 (file)
--- a/imgsizer.xml
+++ b/imgsizer.xml
@@ -1,4 +1,7 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE refentry PUBLIC 
+   "-//OASIS//DTD DocBook XML V4.1.2//EN"
+   "docbook/docbookx.dtd" [
 <!ENTITY % ISOnum PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnum;
 ]>