Re: [ptxdist] [PATCH v2 1/2] add install-environment

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Nov 25, 2011 at 01:40:19AM +0100, Andreas Bießmann wrote:
> We add links to the bin directroy to sane tools found by configure. This
> change was discussed in http://thread.gmane.org/gmane.comp.embedded.ptxdist.devel/8157/focus=8180
> 
> Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
> ---
> no changes since v1
> 
>  Makefile.in |   10 +++++++---
>  bin/ptxdist |    3 +++
>  2 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile.in b/Makefile.in
> index 5ee1383..62fabf6 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -46,10 +46,8 @@ dirty-check:
>  		*-dirty) echo "refusing to install or package a dirty git tree!" ; exit 1 ;; \
>  	esac
>  
> -install: all dirty-check
> +install: all dirty-check install-environment
>  	@echo "installing PTXdist to $(DESTDIR)$(prefix)..."
> -	@rm -fr   "$(DESTDIR)$(instdir)"
> -	@mkdir -p "$(DESTDIR)$(instdir)"
>  	@tar -C "$(abs_srcdir)" -cf - \
>  		--exclude *~ \
>  		--exclude .git \
> @@ -74,6 +72,12 @@ install: all dirty-check
>  		cp scripts/bash_completion "$(DESTDIR)@BASH_COMPLETION_DIR@/ptxdist"; \
>  	fi
>  
> +install-environment: all dirty-check
> +	@echo "preparing PTXdist environment in $(DESTDIR)$(instdir)/bin ..."
> +	@rm -fr   "$(DESTDIR)$(instdir)"
> +	@mkdir -p "$(DESTDIR)$(instdir)"
> +	@mkdir -p $(DESTDIR)$(instdir)/bin
> +	@ln -sf @SED@ $(DESTDIR)$(instdir)/bin/sed


I think this should happen during "make all". In many cases (especially
when using master) an uninstalled ptxdist is used. This should not act
differently. Something like this I think:

all: kconfig environment

kconfig:
	# this was "all" before

environment:
	# the new stuff to create the links.

And please add python and awk as well.

Other than that, it looks good.

Michael

>  
>  dist: dirty-check
>  	@rm -rf "$(project)"
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 900af0f..81946b9 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -2155,6 +2155,9 @@ setup_env() {
>  
>  	export LANG=C
>  	export LC_ALL=POSIX
> +
> +	# ${PTXDIST_TOPDIR}/bin contains links to sane tools found by configure
> +	export PATH="${PTXDIST_TOPDIR}/bin:${PATH}"
>  }
>  
>  
> -- 
> 1.7.7.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de