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.am | |
| 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.am')
| -rw-r--r-- | xorg-server/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am index cf1469ff7..cb98d2c31 100644 --- a/xorg-server/Makefile.am +++ b/xorg-server/Makefile.am @@ -41,11 +41,13 @@ SUBDIRS = \ hw \ test +if XORG aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-server.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-server.pc +endif EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh |