[rhel7] Only install liveinst symlink on supported arches
Martin Kolman
mkolman at redhat.com
Tue Aug 19 09:35:09 UTC 2014
On Mon, 2014-08-18 at 15:29 -0700, Brian C. Lane wrote:
> The symlink to consolehelper from /usr/bin/liveinst should only be done
> on arches with liveinst support, otherwise you will get an error when
> trying to build:
>
> error: Installed (but unpackaged) file(s) found:
> /usr/bin/liveinst
>
> Related: rhbz#1121678
> ---
> data/liveinst/Makefile.am | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/data/liveinst/Makefile.am b/data/liveinst/Makefile.am
> index 80b1769..c4becd0 100644
> --- a/data/liveinst/Makefile.am
> +++ b/data/liveinst/Makefile.am
> @@ -27,6 +27,13 @@ desktop_DATA = liveinst.desktop
>
> xinitdir = $(sysconfdir)/X11/xinit/xinitrc.d
> dist_xinit_SCRIPTS = zz-liveinst.sh
> +
> +install-exec-local:
> + $(MKDIR_P) $(DESTDIR)$(bindir)
> + $(LN_S) consolehelper $(DESTDIR)$(bindir)/liveinst
> +
> +uninstall-local:
> + rm -f $(DESTDIR)$(bindir)/liveinst
> endif
>
> EXTRA_DIST = README liveinst.desktop.in
> @@ -41,7 +48,3 @@ MAINTAINERCLEANFILES = Makefile.in
> EXTRA_DIST += $(srcdir)/liveinst.desktop.in.h
> $(srcdir)/liveinst.desktop.in.h: $(srcdir)/liveinst.desktop.in
> @$(MAKE) -C $(top_builddir)/po $(abs_top_srcdir)/$(subdir)/$$(basename $@)
> -
> -install-exec-local:
> - $(MKDIR_P) $(DESTDIR)$(bindir)
> - $(LN_S) consolehelper $(DESTDIR)$(bindir)/liveinst
ACK!
More information about the anaconda-patches
mailing list