aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/doc/man
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-02 12:30:48 +0000
committermarha <marha@users.sourceforge.net>2010-04-02 12:30:48 +0000
commit1d59691fe77c20ecb010ea8589a940c4ea6ac356 (patch)
treed1ee8df3981303c35e46905c9df26203bb232973 /xorg-server/hw/xfree86/doc/man
parent0be07f8b067afad77df8cac086b43f6d213fbe20 (diff)
downloadvcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.tar.gz
vcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.tar.bz2
vcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.zip
Updated to following packages:
pixman-0.18.0 xorg-server-1.8.0
Diffstat (limited to 'xorg-server/hw/xfree86/doc/man')
-rw-r--r--xorg-server/hw/xfree86/doc/man/Makefile.am8
-rw-r--r--xorg-server/hw/xfree86/doc/man/Makefile.in12
2 files changed, 11 insertions, 9 deletions
diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.am b/xorg-server/hw/xfree86/doc/man/Makefile.am
index d8b2aa73d..737166b51 100644
--- a/xorg-server/hw/xfree86/doc/man/Makefile.am
+++ b/xorg-server/hw/xfree86/doc/man/Makefile.am
@@ -8,12 +8,12 @@ filemandir = $(FILE_MAN_DIR)
fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
Xorg.$(APP_MAN_SUFFIX): Xorg.man
- -rm -f Xorg.$(APP_MAN_SUFFIX)
- $(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
+ -$(AM_V_at)rm -f Xorg.$(APP_MAN_SUFFIX)
+ $(AM_V_at)$(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
- -rm -f xorg.conf.$(FILE_MAN_SUFFIX)
- $(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
+ -$(AM_V_at)rm -f xorg.conf.$(FILE_MAN_SUFFIX)
+ $(AM_V_at)$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
include $(top_srcdir)/cpprules.in
diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.in b/xorg-server/hw/xfree86/doc/man/Makefile.in
index c8b984c06..3f3d9dc0a 100644
--- a/xorg-server/hw/xfree86/doc/man/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/man/Makefile.in
@@ -103,6 +103,7 @@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
+ARM_BACKTRACE_CFLAGS = @ARM_BACKTRACE_CFLAGS@
AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -258,7 +259,7 @@ PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
-SED = sed
+SED = @SED@
SELINUX_CFLAGS = @SELINUX_CFLAGS@
SELINUX_LIBS = @SELINUX_LIBS@
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
@@ -290,6 +291,7 @@ XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
XEPHYR_INCS = @XEPHYR_INCS@
XEPHYR_LIBS = @XEPHYR_LIBS@
+XF86CONFIGDIR = @XF86CONFIGDIR@
XF86CONFIGFILE = @XF86CONFIGFILE@
XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
@@ -678,12 +680,12 @@ uninstall-am: uninstall-appmanDATA uninstall-filemanDATA
Xorg.$(APP_MAN_SUFFIX): Xorg.man
- -rm -f Xorg.$(APP_MAN_SUFFIX)
- $(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
+ -$(AM_V_at)rm -f Xorg.$(APP_MAN_SUFFIX)
+ $(AM_V_at)$(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
- -rm -f xorg.conf.$(FILE_MAN_SUFFIX)
- $(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
+ -$(AM_V_at)rm -f xorg.conf.$(FILE_MAN_SUFFIX)
+ $(AM_V_at)$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
.pre:
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@