diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2013-09-28 15:26:35 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-10-04 14:09:33 -0700 |
| commit | 35a528e49269c3df75486cc606e51a8c1c083c06 (patch) | |
| tree | b8d0fdc01bca2dd6da1e136d954bcf4fda4b6bda | |
| parent | a1d87576a30008253eb0cc92b44c9718f6665062 (diff) | |
Xorg binary: use install-exec-hook rather than install-exec-local
The former was explicitly designed to execute additional code after the binary
has been installed. The latter can be executed in any order, hence it's
current dependency on install-binPROGRAMS as a workaround.
The CYGWIN libXorg.exe.a target is an installation target rather than
a post-installation one, so it should not be done as a hook. It does not depend
on the Xorg executable being installed.
Automake:
"These hooks are run after all other install rules of the appropriate type,
exec or data, have completed. So, for instance, it is possible to perform
post-installation modifications using an install hook".
"With the -local targets, there is no particular guarantee of execution order;
typically, they are run early, but with parallel make, there is no way
to be sure of that".
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 73bddabb8..4b0edeb2e 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -87,17 +87,16 @@ endif # do not use $(mkdir_p) if you want automake 1.7 to work install-data-local: mkdir -p $(DESTDIR)$(logdir) +if CYGWIN + $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a +endif - -install-exec-local: install-binPROGRAMS +install-exec-hook: (cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg$(EXEEXT) X) if INSTALL_SETUID chown root $(DESTDIR)$(bindir)/Xorg chmod u+s $(DESTDIR)$(bindir)/Xorg endif -if CYGWIN - $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a -endif # Use variables from XORG_MANPAGE_SECTIONS and X Server configuration # Do not include manpages.am as values are not appropriate for rc files |