From 9c8845c35df1b63634ed49343844b4e537992dea Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 18 Dec 2013 13:05:30 -0500 Subject: [PATCH] tui: don't bother making links (nmtui-edit, etc) in build tree They end up not working right from the build tree anyway, because the nmtui libtool wrapper doesn't pass its argv[0] on to the actual binary. --- .gitignore | 3 --- tui/Makefile.am | 11 +++-------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 71f7e5333f..40dfe59f5c 100644 --- a/.gitignore +++ b/.gitignore @@ -217,9 +217,6 @@ valgrind-*.log /tui/newt/libnmt-newt.a /tui/nmtui -/tui/nmtui-connect -/tui/nmtui-edit -/tui/nmtui-hostname /tools/generate-settings-spec diff --git a/tui/Makefile.am b/tui/Makefile.am index 797597a7b2..e986367a32 100644 --- a/tui/Makefile.am +++ b/tui/Makefile.am @@ -18,18 +18,15 @@ AM_CPPFLAGS= \ $(NULL) bin_PROGRAMS = nmtui -noinst_SCRIPTS = nmtui-edit nmtui-connect nmtui-hostname - -$(noinst_SCRIPTS): - ln -s nmtui $@ +links = nmtui-edit nmtui-connect nmtui-hostname install-exec-hook: - for link in $(noinst_SCRIPTS); do \ + for link in $(links); do \ ln -f $(DESTDIR)$(bindir)/nmtui $(DESTDIR)$(bindir)/$$link; \ done uninstall-hook: - for link in $(noinst_SCRIPTS); do \ + for link in $(links); do \ rm -f $(DESTDIR)$(bindir)/$$link; \ done @@ -126,6 +123,4 @@ nmtui_LDADD = \ $(GLIB_LIBS) \ $(NULL) -CLEANFILES = $(noinst_SCRIPTS) - endif