[rhel7-branch 16/29] Only install liveinst symlink on supported arches

bcl installerbot-noreply at redhat.com
Tue Jun 2 00:31:17 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

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
(cherry picked from commit 57832f704ad7f692b3ffeaf70880e8845d32a062)

Related: rhbz#1196721
---
 data/liveinst/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/liveinst/Makefile.am b/data/liveinst/Makefile.am
index 7a3562f..c4becd0 100644
--- a/data/liveinst/Makefile.am
+++ b/data/liveinst/Makefile.am
@@ -31,6 +31,9 @@ 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


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/78214896700b4a6dd348230ce0c1c3094818cd1e


More information about the anaconda-patches mailing list