"If the last column wasn't specified, it is auto-sized." (patch by Joerg Sonnenberger)

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 56231e07ffcae37169c658f375507045cef0a3c2..f0199d50499b12bdf1b6c08aa3ff56bf13ce84c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,14 @@ INCLUDEDIR    = $(PREFIX)/include
 LIBDIR         = $(PREFIX)/lib
 MANDIR         = $(PREFIX)/man
 EXAMPLEDIR     = $(PREFIX)/share/examples/mandoc
-INSTALL_PROGRAM        = install -m 0755
-INSTALL_DATA   = install -m 0444
-INSTALL_LIB    = install -m 0644
+INSTALL                = install
+INSTALL_PROGRAM        = $(INSTALL) -m 0755
+INSTALL_DATA   = $(INSTALL) -m 0444
+INSTALL_LIB    = $(INSTALL) -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.9.22
-VDATE     = 31 March 2010
+VERSION           = 1.9.25
+VDATE     = 13 May 2010
 
 VFLAGS    = -DVERSION="\"$(VERSION)\""
 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
@@ -21,9 +22,9 @@ CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
 
-# Specify this if you want to accept Xo/Xc macros extending the head of
-# block full-implicit macros.
-# CFLAGS += -DUGLY
+# Unset this if you don't want Xo/Xc allowing split `It' lines, which
+# breaks symmetry.
+CFLAGS   += -DUGLY
 
 LINTFLAGS += $(VFLAGS)
 
@@ -84,10 +85,10 @@ MANS           = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
 BINS      = mandoc
 TESTS     = test-strlcat.c test-strlcpy.c
 CONFIGS           = config.h.pre config.h.post
-CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+DOCLEAN           = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
             $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
             $(GHTMLS) config.h config.log
-INSTALL           = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+DOINSTALL  = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
             $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
 
 all:   $(BINS)
@@ -95,7 +96,7 @@ all:  $(BINS)
 lint:  $(LLNS)
 
 clean:
-       rm -f $(CLEAN)
+       rm -f $(DOCLEAN)
 
 cleanlint:
        rm -f $(LNS) $(LLNS)
@@ -110,11 +111,11 @@ www:      all $(GSGMLS) $(GHTMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 htmls: all $(GSGMLS) $(GHTMLS)
 
 installwww: www
-       install -m 0444 $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
-       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
-       install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
-       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
-       install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
+       $(INSTALL_DATA) $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
+       $(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+       $(INSTALL_DATA) mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
+       $(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+       $(INSTALL_DATA) mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
 
 install:
        mkdir -p $(BINDIR)
@@ -123,7 +124,7 @@ install:
        mkdir -p $(MANDIR)/man7
        $(INSTALL_PROGRAM) mandoc $(BINDIR)
        $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
-       $(INSTALL_MAN) man.7 mdoc.7 $(MANDIR)/man7
+       $(INSTALL_MAN) man.7 mdoc.7 mandoc_char.7 $(MANDIR)/man7
        $(INSTALL_DATA) example.style.css $(EXAMPLEDIR)
 
 uninstall:
@@ -131,6 +132,7 @@ uninstall:
        rm -f $(MANDIR)/man1/mandoc.1
        rm -f $(MANDIR)/man7/mdoc.7
        rm -f $(MANDIR)/man7/man.7
+       rm -f $(MANDIR)/man7/mandoc_char.7
        rm -f $(EXAMPLEDIR)/example.style.css
 
 $(OBJS): config.h
@@ -204,9 +206,9 @@ ChangeLog.txt:
 ChangeLog.html: ChangeLog.xml ChangeLog.xsl
        xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
-mdocml-$(VERSION).tar.gz: $(INSTALL)
+mdocml-$(VERSION).tar.gz: $(DOINSTALL)
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
-       cp -f $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+       cp -f $(DOINSTALL) .dist/mdocml/mdocml-$(VERSION)/
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/