Skip to content

Commit

Permalink
Only install liveinst symlink on supported arches
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bcl committed Aug 19, 2014
1 parent 642c2c4 commit 57832f7
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions data/liveinst/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 57832f7

Please sign in to comment.