From 57832f704ad7f692b3ffeaf70880e8845d32a062 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 18 Aug 2014 15:27:26 -0700 Subject: [PATCH] Only install liveinst symlink on supported arches 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 80b17695c2e..c4becd07382 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