svn merge ^/branches/released .

3 files changed, 23 insertions, 29 deletions

diff --git a/xorg-server/hw/xfree86/fbdevhw/Makefile.am b/xorg-server/hw/xfree86/fbdevhw/Makefile.am
index 076b9741f..2a038905e 100644
--- a/xorg-server/hw/xfree86/fbdevhw/Makefile.am
+++ b/xorg-server/hw/xfree86/fbdevhw/Makefile.am
@@ -1,27 +1,19 @@
-module_LTLIBRARIES = libfbdevhw.la

-

-libfbdevhw_la_LDFLAGS = -avoid-version

-

-if FBDEVHW

-libfbdevhw_la_SOURCES = fbdevhw.c

-else

-libfbdevhw_la_SOURCES = fbdevhwstub.c

-endif

-

-INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c

-

-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

-

-sdk_HEADERS = fbdevhw.h

-

-include $(top_srcdir)/cpprules.in

-

-drivermandir = $(DRIVER_MAN_DIR)

-driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX)

-CLEANFILES = $(driverman_DATA) fbdevhw.man

-

-fbdevhw.$(DRIVER_MAN_SUFFIX): fbdevhw.man

-	-$(AM_V_at)rm -f fbdevhw.$(DRIVER_MAN_SUFFIX)

-	$(AM_V_at)$(LN_S) fbdevhw.man fbdevhw.$(DRIVER_MAN_SUFFIX)

-

-EXTRA_DIST = fbpriv.h fbdevhw.man.pre README

+SUBDIRS = man
+
+module_LTLIBRARIES = libfbdevhw.la
+
+libfbdevhw_la_LDFLAGS = -avoid-version
+
+if FBDEVHW
+libfbdevhw_la_SOURCES = fbdevhw.c
+else
+libfbdevhw_la_SOURCES = fbdevhwstub.c
+endif
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+
+sdk_HEADERS = fbdevhw.h
+
+EXTRA_DIST = fbpriv.h README
diff --git a/xorg-server/hw/xfree86/fbdevhw/man/Makefile.am b/xorg-server/hw/xfree86/fbdevhw/man/Makefile.am
new file mode 100644
index 000000000..7f22a12b9
--- /dev/null
+++ b/xorg-server/hw/xfree86/fbdevhw/man/Makefile.am
@@ -0,0 +1,2 @@
+include $(top_srcdir)/manpages.am
+driverman_PRE = fbdevhw.man
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.man.pre b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
index deeced860..fe5d1e17b 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.man.pre
+++ b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $
 .TH FBDEVHW __drivermansuffix__ __vendorversion__
 .SH NAME
 fbdevhw \- os-specific submodule for framebuffer device access
@@ -14,7 +14,7 @@ fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the
 fbdevhw module.  fbdevhw can be used by other drivers too, this
 is usually activated with `Option "UseFBDev"' in the device section.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), 
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
 xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
 fbdev(__drivermansuffix__)
 .SH AUTHORS