diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2017-04-03 08:55:04 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-04-03 10:25:23 +0100 |
| commit | 1e58efb16f76b52c059d5e5d6c4c5d91c2abaad2 (patch) | |
| tree | c1dcdecc6f9b40b21eba7a793f4b863cbde8f544 /utils/hp2ps | |
| parent | f541fc63060aa5806c18cbaa5ef05dd180c52ebb (diff) | |
| download | haskell-1e58efb16f76b52c059d5e5d6c4c5d91c2abaad2.tar.gz | |
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@gentoo.org>
Diffstat (limited to 'utils/hp2ps')
| -rw-r--r-- | utils/hp2ps/ghc.mk | 5 | ||||
| -rw-r--r-- | utils/hp2ps/hp2ps.wrapper | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk index 64a3a6d78d..f6e01ec6c1 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/hp2ps/hp2ps.wrapper b/utils/hp2ps/hp2ps.wrapper new file mode 100644 index 0000000000..22982ef0f8 --- /dev/null +++ b/utils/hp2ps/hp2ps.wrapper @@ -0,0 +1,2 @@ +#!/bin/sh +exec "$executablename" ${1+"$@"} |