diff options
author | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
commit | 9dbe22229a8031aa2f6d922896e1b6539441b7b5 (patch) | |
tree | bd567f1d98f9431b4963dc3d0b05aea8ac78a1b6 /xorg-server/Makefile.in | |
parent | 07d4e6e86e3167bed18d2af81a56f3d9352d2541 (diff) | |
parent | 7687adcc34c9fc43d526f30b1cf2039b0af48841 (diff) | |
download | vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.gz vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.bz2 vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/Makefile.in')
-rw-r--r-- | xorg-server/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/Makefile.in b/xorg-server/Makefile.in index da6da5c1d..41bb4296f 100644 --- a/xorg-server/Makefile.in +++ b/xorg-server/Makefile.in @@ -466,10 +466,10 @@ SUBDIRS = \ hw \ test -aclocaldir = $(datadir)/aclocal -aclocal_DATA = xorg-server.m4 -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xorg-server.pc +@XORG_TRUE@aclocaldir = $(datadir)/aclocal +@XORG_TRUE@aclocal_DATA = xorg-server.m4 +@XORG_TRUE@pkgconfigdir = $(libdir)/pkgconfig +@XORG_TRUE@pkgconfig_DATA = xorg-server.pc EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh DISTCLEANFILES = doltcompile doltlibtool MAINTAINERCLEANFILES = ChangeLog |