diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-06-28 15:34:21 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-06-28 15:34:21 +0000 |
| commit | 620ecbee2ed1cb478e0289722d86dd72717f1cb8 (patch) | |
| tree | 7a427b24d86f6789706acee21a52dca15b88806b /buildtools | |
| parent | 8c2dab4922b514045cbae8e71ba93aaf8c0fff48 (diff) | |
| download | netpbm-mirror-620ecbee2ed1cb478e0289722d86dd72717f1cb8.tar.gz netpbm-mirror-620ecbee2ed1cb478e0289722d86dd72717f1cb8.tar.xz netpbm-mirror-620ecbee2ed1cb478e0289722d86dd72717f1cb8.zip | |
Release 10.71.00
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2588 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/Makefile | 6 | ||||
| -rw-r--r-- | buildtools/README.pkg | 2 | ||||
| -rwxr-xr-x | buildtools/makeman | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/buildtools/Makefile b/buildtools/Makefile index 6a2e33da..8671c066 100644 --- a/buildtools/Makefile +++ b/buildtools/Makefile @@ -8,9 +8,9 @@ include $(BUILDDIR)/config.mk MERGE_OBJECTS = -PROGS = libopt typegen endiangen +BUILDPROGS = libopt typegen endiangen -all: $(PROGS) +all: $(BUILDPROGS) OMIT_BUILDTOOL_RULE = 1 include $(SRCDIR)/common.mk @@ -39,4 +39,4 @@ $(BUILDPROGS):%:%.o distclean clean: cleanlocal .PHONY: cleanlocal cleanlocal: - rm -f $(PROGS) + rm -f $(BUILDPROGS) diff --git a/buildtools/README.pkg b/buildtools/README.pkg index 6761ecf3..d642dee8 100644 --- a/buildtools/README.pkg +++ b/buildtools/README.pkg @@ -172,7 +172,7 @@ library might use netpbm-config to generate the necessary compiler and linker options to access that library. Using netpbm-config, it's possible to have a viable Netpbm installation where -netpbm.config is the only file in any default search path. +netpbm-config is the only file in any default search path. The xxx-config concept (in general, not just Netpbm) has largely been replaced by the pkg-config concept (see netpbm.pc above). diff --git a/buildtools/makeman b/buildtools/makeman index 100ad580..9b2653bf 100755 --- a/buildtools/makeman +++ b/buildtools/makeman @@ -51,9 +51,7 @@ def makeman(name, file, indoc): # Protect escapes before we try generating font changes. indoc = indoc.replace("\\", r"\e") # Header-bashing - indoc = indoc.replace('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "DTD/xhtml11.dtd">', "") - indoc = indoc.replace('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', "") - indoc = indoc.replace('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">\n',"") + indoc = re.sub('(?i)<!DOCTYPE html[^>]*>', "", indoc) indoc = indoc.replace('<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">', "") indoc = indoc.replace('<meta http-equiv="Content-Type" content="text/html; charset=us-ascii"/>', "") indoc = indoc.replace('<?xml version="1.1" encoding="iso-8859-1" ?>\n',"") @@ -210,6 +208,7 @@ def makeman(name, file, indoc): # Special characters indoc = indoc.replace(""", "'") indoc = indoc.replace(" ", "\\ ") + indoc = indoc.replace("\", "\\\\") # Tables indoc = re.sub(' *<table[^>]*>.*', ".TS", indoc) indoc = re.sub(" *</table>.*", ".TE", indoc) |