diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | nvidia-xconfig.1.m4 | 11 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -162,6 +162,7 @@ $(MANPAGE_not_gzipped): nvidia-xconfig.1.m4 $(OPTIONS_1_INC) $(VERSION_MK) $(call quiet_cmd,M4) -D__HEADER__=$(AUTO_TEXT) -I $(OUTPUTDIR) \ -D__VERSION__=$(NVIDIA_VERSION) \ -D__DATE__="`$(DATE) +%F`" \ + -D__BUILD_OS__=$(TARGET_OS) \ $< > $@ $(MANPAGE_gzipped): $(MANPAGE_not_gzipped) diff --git a/nvidia-xconfig.1.m4 b/nvidia-xconfig.1.m4 index cdc1b60..03893c9 100644 --- a/nvidia-xconfig.1.m4 +++ b/nvidia-xconfig.1.m4 @@ -1,12 +1,15 @@ dnl This file is to be preprocessed by m4. changequote([[[, ]]])dnl define(__OPTIONS__, [[[include([[[options.1.inc]]])dnl]]])dnl +dnl Solaris man chokes on three-letter macros. +ifelse(__BUILD_OS__,SunOS,[[[define(__URL__,UR)]]],[[[define(__URL__,URL)]]])dnl .\" Copyright (C) 2005-2010 NVIDIA Corporation. .\" __HEADER__ -.\" Define the URL macro and then load the URL package if it exists. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 +.\" Define the .__URL__ macro and then override it with the www.tmac package if it +.\" exists. +.de __URL__ +\\$2 \(la \\$1 \(ra\\$3 .. .if \n[.g] .mso www.tmac .TH nvidia\-xconfig 1 "__DATE__" "nvidia\-xconfig __VERSION__" @@ -72,7 +75,7 @@ The source code to is released under the GPL and available here: .sp .ti +5 -.URL "ftp://download.nvidia.com/XFree86/nvidia\-xconfig/" +.__URL__ "ftp://download.nvidia.com/XFree86/nvidia\-xconfig/" .sp Patches are welcome. dnl Call gen-manpage-opts to generate this section. @@ -1 +1 @@ -NVIDIA_VERSION = 304.64 +NVIDIA_VERSION = 304.84 |