diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-16 09:49:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-16 09:49:27 +0000 |
| commit | ab5c2d2c78273ccdc7c9734bcba482a33fcf9652 (patch) | |
| tree | d12aaeba9956621fe7429d94a7c90105fe306b42 /xorg-server/hw/xfree86/Makefile.am | |
| parent | 421ecdd3ee6f691c63c4568944423d986f9f69db (diff) | |
| parent | 08cbf3b50bfe713044f36b363c73768cd042f13c (diff) | |
| download | vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.tar.gz vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.tar.bz2 vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.zip | |
merge ^/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 94ef966e2..6fa1dd29f 100644 --- a/xorg-server/hw/xfree86/Makefile.am +++ b/xorg-server/hw/xfree86/Makefile.am @@ -112,7 +112,7 @@ CONF_SUBSTS = -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \ -e 's|DEFAULTFONTPATH|$(COMPILEDDEFAULTFONTPATH)|g'
xorg.conf.example: xorgconf.cpp
- $(AM_V_GEN)$(SED) $(CONF_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(CONF_SUBSTS) < $(srcdir)/xorgconf.cpp > $@
relink:
$(AM_V_at)rm -f Xorg && $(MAKE) Xorg
|