1.1 --- a/Makefile.in	Sat Jan 14 18:22:06 2012 +0100
     1.2 +++ b/Makefile.in	Mon Jan 16 23:36:42 2012 +0100
     1.3 @@ -151,8 +151,9 @@
     1.4             scripts/showTuple.sh
     1.5  	@chmod 755 $^
     1.6  
     1.7 -build-lib: paths.mk             \
     1.8 -           config/configure.in
     1.9 +build-lib: config/configure.in  \
    1.10 +           paths.mk             \
    1.11 +           paths.sh
    1.12  
    1.13  build-lib-kconfig:
    1.14  	@$(MAKE) -C kconfig
    1.15 @@ -189,24 +190,36 @@
    1.16  	$(call sed_it)
    1.17  
    1.18  # We create a script fragment that is parseable from inside a Makefile,
    1.19 -# but also from inside a shell script, hence the reason why we don't
    1.20 -# use := to set variables, although that will incur a (very small)
    1.21 -# penalty from the Makefile that includes it (due to re-evaluation at
    1.22 -# each call).
    1.23 +# and one from inside a shell script
    1.24  paths.mk: FORCE
    1.25  	@echo "  GEN    '$@'"
    1.26 -	@(echo "export install=$(install)"; \
    1.27 -	  echo "export bash=$(bash)";       \
    1.28 -	  echo "export grep=$(grep)";       \
    1.29 -	  echo "export make=$(make)";       \
    1.30 -	  echo "export sed=$(sed)";         \
    1.31 -	  echo "export libtool=$(libtool)"; \
    1.32 -	  echo "export libtoolize=$(libtoolize)"; \
    1.33 -	  echo "export objcopy=$(objcopy)"; \
    1.34 -	  echo "export objdump=$(objdump)"; \
    1.35 -	  echo "export readelf=$(readelf)"; \
    1.36 -	  echo "export patch=$(patch)";     \
    1.37 -	 ) >paths.mk
    1.38 +	@(echo 'export install=$(install)';         \
    1.39 +	  echo 'export bash=$(bash)';               \
    1.40 +	  echo 'export grep=$(grep)';               \
    1.41 +	  echo 'export make=$(make)';               \
    1.42 +	  echo 'export sed=$(sed)';                 \
    1.43 +	  echo 'export libtool=$(libtool)';         \
    1.44 +	  echo 'export libtoolize=$(libtoolize)';   \
    1.45 +	  echo 'export objcopy=$(objcopy)';         \
    1.46 +	  echo 'export objdump=$(objdump)';         \
    1.47 +	  echo 'export readelf=$(readelf)';         \
    1.48 +	  echo 'export patch=$(patch)';             \
    1.49 +	 ) >$@
    1.50 +
    1.51 +paths.sh: FORCE
    1.52 +	@echo "  GEN    '$@'"
    1.53 +	@(echo 'export install="$(install)"';       \
    1.54 +	  echo 'export bash="$(bash)"';             \
    1.55 +	  echo 'export grep="$(grep)"';             \
    1.56 +	  echo 'export make="$(make)"';             \
    1.57 +	  echo 'export sed="$(sed)"';               \
    1.58 +	  echo 'export libtool="$(libtool)"';       \
    1.59 +	  echo 'export libtoolize="$(libtoolize)"'; \
    1.60 +	  echo 'export objcopy="$(objcopy)"';       \
    1.61 +	  echo 'export objdump="$(objdump)"';       \
    1.62 +	  echo 'export readelf="$(readelf)"';       \
    1.63 +	  echo 'export patch="$(patch)"';           \
    1.64 +	 ) >$@
    1.65  
    1.66  config/configure.in: FORCE
    1.67  	@echo "  GEN    '$@'"
    1.68 @@ -239,8 +252,8 @@
    1.69  	@rm -f scripts/showTuple.sh
    1.70  
    1.71  clean-lib:
    1.72 -	@echo "  RM     'paths.mk'"
    1.73 -	@rm -f paths.mk
    1.74 +	@echo "  RM     'paths'"
    1.75 +	@rm -f paths.mk paths.sh
    1.76  	@echo "  RM     'config/configure.in'"
    1.77  	@rm -f config/configure.in
    1.78  
    1.79 @@ -304,8 +317,8 @@
    1.80  install-lib-main: $(DESTDIR)$(libdir) $(patsubst %,install-lib-%,$(LIB_SUB_DIR))
    1.81  	@echo "  INST    'steps.mk'"
    1.82  	@$(install) -m 644 steps.mk "$(DESTDIR)$(libdir)/steps.mk"
    1.83 -	@echo "  INST    'paths.mk'"
    1.84 -	@$(install) -m 644 paths.mk "$(DESTDIR)$(libdir)/paths.mk"
    1.85 +	@echo "  INST    'paths'"
    1.86 +	@$(install) -m 644 paths.mk paths.sh "$(DESTDIR)$(libdir)"
    1.87  
    1.88  # Samples need a little love:
    1.89  #  - change every occurrence of CT_TOP_DIR to CT_LIB_DIR