diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-24 15:43:48 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-04-24 15:43:48 -0700 |
| commit | c6e4105ce40ef053e026cc0ffe4925ab568ea700 (patch) | |
| tree | fc0dc085da1e894a95ae8fddd6d06e4703d143ad /man/Makefile.am | |
| parent | 5d9b75b432dbc525e10c1c00436a1820456f6fb4 (diff) | |
| parent | 4ff648c85f8aa90b343b7e2df176c0511b3cdaa5 (diff) | |
Merge branch 'randr-1.2'
Conflicts:
configure.ac
man/Makefile.am
man/nv.man
src/g80_display.h
src/g80_output.c
src/nv_driver.c
Diffstat (limited to 'man/Makefile.am')
| -rw-r--r-- | man/Makefile.am | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index 442d27d..bf7ec17 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -41,12 +41,6 @@ SED = sed XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -if SUPPORT_G80 -MAN_SUPPORT_G80 = 1 -else -MAN_SUPPORT_G80 = 0 -endif - MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ @@ -57,8 +51,7 @@ MAN_SUBSTS = \ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \ - -e 's|__support_g80__|$(MAN_SUPPORT_G80)|g' + -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man |