[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9cf8930959b92b7a5a6d3f176065937f12b66efb
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

9cf8930 by Fabian Raetz (fabian.raetz@xxxxxxxxx):

    Fix install_desktop_files non-portability and add out-of-tree support.
    
    Prepend $(srcdir)/ to the sources in install commands, and get rid of
    the -T flag, as it's GNU coreutils install-specific; some versions of
    install don't support -T at all, and FreeBSD's install has a -T flag
    that takes an argument and has a completely different meaning.
    
    Fixes bug 10292; fix came from
    
        http://marc.info/?l=openbsd-ports&m=140571104528980&w=2
    
    Change-Id: I8e80d475a728a17848736be043f97d2b90a0be82
    Reviewed-on: https://code.wireshark.org/review/3107
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 4b720691c45e1a803bdcc01567ac1ec52da62740)
    Reviewed-on: https://code.wireshark.org/review/3109
    

Actions performed:

    from  cb36560   WebSocket: increase max unmask payload size to 256K and indicate that packet is truncated is going above the new limit
    adds  9cf8930   Fix install_desktop_files non-portability and add out-of-tree support.


Summary of changes:
 Makefile.am |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)