[master] analog: put it under /usr/bin so it's on the path in an installed system.

[Ales Kozumplik]

Related: rhbz#576439
---
 anaconda.spec.in    |    1 +
 scripts/Makefile.am |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 8b8e9ce..055805a 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -216,6 +216,7 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/python*/site-packages/pyanaconda/*
 %{_libdir}/python*/site-packages/log_picker/*
 %{_libdir}/anaconda*
+%{_bindir}/analog
 %ifarch %livearches
 %{_bindir}/liveinst
 %{_sbindir}/liveinst
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 187d4c6..ac5a080 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,8 +25,7 @@ dist_scripts_DATA    = mk-images.* pyrc.py
 dist_noinst_SCRIPTS  = getlangnames.py upd-bootimage upd-initrd upd-kernel \
                        makeupdates

-analogdir = $(libexecdir)/$(PACKAGE_NAME)
-dist_analog_SCRIPTS = analog
+dist_bin_SCRIPTS = analog

stage2scriptsdir = $(datadir)/$(PACKAGE_NAME)
 dist_stage2scripts_SCRIPTS = restart-anaconda

[Martin Gracik]

ack

On Tue, 2010-11-30 at 15:07 +0100, Ales Kozumplik wrote:
> Related: rhbz#576439
>
> anaconda.spec.in    |    1 +
>  scripts/Makefile.am |    3 +--
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/anaconda.spec.in b/anaconda.spec.in
> index 8b8e9ce..055805a 100644
> --- a/anaconda.spec.in
> +++ b/anaconda.spec.in
> @@ -216,6 +216,7 @@ update-desktop-database &> /dev/null || :
>  %{_libdir}/python*/site-packages/pyanaconda/*
>  %{_libdir}/python*/site-packages/log_picker/*
>  %{_libdir}/anaconda*
> +%{_bindir}/analog
>  %ifarch %livearches
>  %{_bindir}/liveinst
>  %{_sbindir}/liveinst
> diff --git a/scripts/Makefile.am b/scripts/Makefile.am
> index 187d4c6..ac5a080 100644
> --- a/scripts/Makefile.am
> +++ b/scripts/Makefile.am
> @@ -25,8 +25,7 @@ dist_scripts_DATA    = mk-images.* pyrc.py
>  dist_noinst_SCRIPTS  = getlangnames.py upd-bootimage upd-initrd upd-kernel \
>                         makeupdates
>
> -analogdir = $(libexecdir)/$(PACKAGE_NAME)
> -dist_analog_SCRIPTS = analog
> +dist_bin_SCRIPTS = analog
>
> stage2scriptsdir = $(datadir)/$(PACKAGE_NAME)
>  dist_stage2scripts_SCRIPTS = restart-anaconda