diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
| commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
| tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/Makefile.am | |
| parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
| parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
| download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/Makefile.am')
| -rw-r--r-- | xorg-server/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am index a5e07307c..667c0de72 100644 --- a/xorg-server/Makefile.am +++ b/xorg-server/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc +AUTOMAKE_OPTIONS=nostdinc ACLOCAL_AMFLAGS = -I m4 if COMPOSITE @@ -49,7 +49,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-server.pc endif -EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh +EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh DISTCHECK_CONFIGURE_FLAGS=\ --with-xkb-path=$(XKB_BASE_DIRECTORY) \ @@ -57,14 +57,16 @@ DISTCHECK_CONFIGURE_FLAGS=\ --with-xkb-output='$${datadir}/X11/xkb/compiled' DISTCLEANFILES = doltcompile doltlibtool -MAINTAINERCLEANFILES=ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL DIST_SUBDIRS = \ doc \ |