On Sun, 2010-08-08 at 05:23 -0500, Yaakov (Cygwin/X) wrote:

> From: Yaakov Selkowitz <[email protected]>
> 
> Using LN_S is required for portability; on MinGW, this is "cp -p".
> 
> The install-exec-hook in src/Makefile.am must remain !PLATFORM_WIN32,
> as Windows cannot resolve DLL runtime dependencies from symlinks.
> 
> Signed-off-by: Yaakov Selkowitz <[email protected]>
> ---
>  Makefile.am  |    4 +---
>  configure.ac |    1 +
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 412aefc..5eed6e3 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -31,10 +31,8 @@ EXTRA_DIST =                  \
>       old-doc/Changelog  \
>       old-doc/CHANGES
>  
> -if !PLATFORM_WIN32
>  install-exec-hook:
> -     cd $(DESTDIR)$(libdir) && rm -f libx...@libext@ && ln -s $(DEFAULT_LIB) 
> libx...@libext@
> -endif
> +     cd $(DESTDIR)$(libdir) && rm -f libx...@libext@ && $(LN_S) 
> $(DEFAULT_LIB) libx...@libext@
>  
> 
>  .PHONY: ChangeLog INSTALL
> diff --git a/configure.ac b/configure.ac
> index 84f21d4..47f2215 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -54,6 +54,7 @@ platform_darwin=no
>  LIBEXT=so
>  case $host_os in
>      cygwin*|mingw*)
> +     LIBEXT=dll.a
>       platform_win32=yes
>       ;;
>      darwin*)


Acked-by: Gaetan Nadon <[email protected]>

It would be preferable to do the LN_S change in a separate patch as it
distract from the core changes.
Is the library extension renaming part of the exec-hook? Why does it
have to change?
I had a hard time understand the creative explanation "must remain !
PLATFORM_WIN32".
Perhaps something like "must be done on all platforms including WIN32".

These nits are magnified as I am not familiar with the platform.
One more thing, which isn't related to your path, does the "clean" and
"uninstall" target work correctly, given the
work done in the exec hook?

Gaetan


Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to