diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
| commit | 0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b (patch) | |
| tree | 7f9e41630a661eaab39bef9023c2661a7281af96 /xorg-server/hw/xfree86/Makefile.am | |
| parent | 8def4a30414ae76e228f285ccab8bba6de083d08 (diff) | |
| download | vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2 vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip | |
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xfree86/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am index 914e11fa1..116113b1a 100644 --- a/xorg-server/hw/xfree86/Makefile.am +++ b/xorg-server/hw/xfree86/Makefile.am @@ -114,7 +114,7 @@ CPP_FILES_FLAGS = \ -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" relink: - rm -f Xorg && $(MAKE) Xorg + $(AM_V_at)rm -f Xorg && $(MAKE) Xorg xorg.conf.example.pre: xorgconf.cpp cp $(srcdir)/xorgconf.cpp $@ |