diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-24 15:00:52 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-24 15:00:52 +0000 |
| commit | a347ddc5148ab2f95f2f409a90aced0e48b36c37 (patch) | |
| tree | c51e1ba2f526f8c4475cd4bc71b6c02a16c42b42 /app/xman/vendor.h | |
| parent | cbeaaf916a38c4fd3b33423c67b54995f8a000e5 (diff) | |
Update to xman 1.1.0
Diffstat (limited to 'app/xman/vendor.h')
| -rw-r--r-- | app/xman/vendor.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/app/xman/vendor.h b/app/xman/vendor.h index 0e0c72d50..21ff3ec6d 100644 --- a/app/xman/vendor.h +++ b/app/xman/vendor.h @@ -1,5 +1,5 @@ /* $XConsortium: vendor.h,v 1.12 94/04/17 20:44:00 rws Exp $ */ -/* $XdotOrg: app/xman/vendor.h,v 1.7 2005/11/08 06:33:33 jkj Exp $ */ +/* $XdotOrg: xc/programs/xman/vendor.h,v 1.4 2004/10/18 14:21:47 eich Exp $ */ /* Copyright (c) 1991 X Consortium @@ -59,7 +59,7 @@ from the X Consortium. # define SEARCHDIR MAN #endif -#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || (defined(BSD) && (BSD >= 199103)) || defined(linux) ) +#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4)) && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) || defined(__CYGWIN__) ) # define SEARCHOTHER CAT #endif @@ -83,7 +83,7 @@ from the X Consortium. # define SYSMANPATH "/usr/share/man" #elif defined(hcx) # define SYSMANPATH "/usr/catman/local_man:/usr/catman/u_man:/usr/catman/a_man:/usr/catman/p_man:/usr/catman/ada_man" -#elif defined(SYSV) && defined(i386) && !defined(__SCO__) +#elif defined(SYSV) && defined(i386) && !defined(__SCO__) && !defined(sun) # define SYSMANPATH "/usr/catman/u_man:/usr/catman/p_man" #elif defined(sgi) # define SYSMANPATH "/usr/catman/a_man:/usr/catman/g_man:/usr/catman/p_man:/usr/catman/u_man:/usr/man/p_man:/usr/man/u_man:/usr/man" @@ -101,7 +101,7 @@ from the X Consortium. #if defined( macII ) || defined( hcx ) || \ (defined(SYSV) && defined(i386) && !defined(ISC) && \ - !defined(__UNIXWARE__) && !defined(__SCO__)) || defined(sgi) + !defined(__UNIXWARE__) && !defined(__SCO__) && !defined(sun)) || defined(sgi) # define COMPRESSION_EXTENSION "z" # define UNCOMPRESS_FORMAT "pcat %s > %s" # define NO_COMPRESS /* mac can't handle using pack as a filter and @@ -137,6 +137,17 @@ from the X Consortium. # define GUNZIP_FORMAT "gzip -c -d < %s >> %s" # endif # define GZIP_COMPRESS "gzip" +# define BZIP2_EXTENSION "bz2" +# define LZMA_EXTENSION "lzma" +# ifndef HAS_MKSTEMP +# define BUNZIP2_FORMAT "bunzip2 -c -d < %s > %s" +# define UNLZMA_FORMAT "unlzma -c -d < %s > %s" +# else +# define BUNZIP2_FORMAT "bunzip2 -c -d < %s >> %s" +# define UNLZMA_FORMAT "unlzma -c -d < %s >> %s" +# endif +# define BZIP2_COMPRESS "bzip2" +# define LZMA_COMPRESS "lzma" #endif @@ -172,7 +183,7 @@ from the X Consortium. # define FORMAT "| eqn | tbl | nroff -mandoc" # elif defined(BSD) && (BSD >= 199103) # define FORMAT "| eqn | tbl | nroff -man" -# elif defined(linux) +# elif defined(linux) || defined(__CYGWIN__) # define FORMAT "| pic | eqn | tbl -Tlatin1 | GROFF_NO_SGR= groff -Tlatin1 -mandoc" # else # define FORMAT "| neqn | nroff -man" /* The format command. */ @@ -217,7 +228,7 @@ from the X Consortium. * "man" directories. */ #if (defined(macII) || defined(CRAY) || defined(hcx) || \ - (defined(SYSV) && defined(i386))) && !defined(SCO) + (defined(SYSV) && defined(i386))) && !defined(SCO) && !defined(sun) # define CAT MAN #elif defined(SCO) # define CAT "cat." |