[commit: ghc] ghc-8.2: hp2ps: install shell wrapper (5769f4c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/5769f4c4c94e78f79ecded94cfdc95ebbcbcd28a/ghc

>---------------------------------------------------------------

commit 5769f4c4c94e78f79ecded94cfdc95ebbcbcd28a
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Mon Apr 3 08:55:04 2017 +0100

    hp2ps: install shell wrapper
    
    Before this change we installed hp2ps both
    to inplace/bin/ and ${prefix}/bin/
    
    In both cases we added $(CrossCompilePrefix) as
    a binary prefix. It's incorrect for inplace install
    as none of inplace binaries are prefixed.
    
    The change it to track 'hp2ps' as unprefixed binary.
    $(CrossCompilePrefix) prefix is only added to the
    installed shell wrapper.
    
    Now 'hp2ps' is handled in a similar way to 'hpc' and
    'ghc-pkg'.
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    (cherry picked from commit 1e58efb16f76b52c059d5e5d6c4c5d91c2abaad2)


>---------------------------------------------------------------

5769f4c4c94e78f79ecded94cfdc95ebbcbcd28a
 utils/hp2ps/ghc.mk                             | 5 +++--
 utils/{hpc/hpc.wrapper => hp2ps/hp2ps.wrapper} | 0
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk
index 64a3a6d..f6e01ec 100644
--- a/utils/hp2ps/ghc.mk
+++ b/utils/hp2ps/ghc.mk
@@ -16,11 +16,12 @@ utils/hp2ps_dist_C_SRCS          = AreaBelow.c Curves.c Error.c Main.c \
                                    Axes.c Dimensions.c Key.c PsFile.c Shade.c \
                                    Utilities.c
 utils/hp2ps_dist_EXTRA_LIBRARIES = m
-utils/hp2ps_dist_PROGNAME        = $(CrossCompilePrefix)hp2ps
+utils/hp2ps_dist_PROGNAME        = hp2ps
 utils/hp2ps_dist_INSTALL         = YES
 utils/hp2ps_dist_INSTALL_INPLACE = YES
+utils/hp2ps_dist_SHELL_WRAPPER              = YES
+utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_NAME = hp2ps
 
 utils/hp2ps_CC_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS))
 
 $(eval $(call build-prog,utils/hp2ps,dist,0))
-
diff --git a/utils/hpc/hpc.wrapper b/utils/hp2ps/hp2ps.wrapper
similarity index 100%
copy from utils/hpc/hpc.wrapper
copy to utils/hp2ps/hp2ps.wrapper