diff options
-rw-r--r-- | CREDITS | 4 | ||||
-rw-r--r-- | Makefile.in | 16 | ||||
-rw-r--r-- | rules/other/Toplevel.make | 4 | ||||
-rw-r--r-- | scripts/kconfig/Makefile | 2 |
4 files changed, 19 insertions, 7 deletions
@@ -83,6 +83,10 @@ N: Oscar Peredo E: oscar@exis.cl D: Developer +N: Chuck Robey +E: chuckr@chuckr.org +D: Developer + N: Erwin Rol E: erwin@erwinrol.com D: Developer diff --git a/Makefile.in b/Makefile.in index 40f08adb3..2fcc01ea2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,14 +5,18 @@ bindir := ${prefix}/bin version := @PACKAGE_VERSION@ instdir := ${libdir}/ptxdist-${version} +# make sure we use bash, even if the user has some other standard shell +SHELL=bash +export SHELL + all: @echo "building lxdialog..." cp ${abs_srcdir}/scripts/ptx-modifications/Makefile.lxdialog.ptx ${abs_srcdir}/scripts/lxdialog/Makefile - cd ${abs_srcdir}/scripts/lxdialog && make + cd ${abs_srcdir}/scripts/lxdialog && ${MAKE} @echo "building conf..." - cd ${abs_srcdir}/scripts/kconfig && make conf + cd ${abs_srcdir}/scripts/kconfig && ${MAKE} conf @echo "building mconf..." - cd ${abs_srcdir}/scripts/kconfig && make mconf + cd ${abs_srcdir}/scripts/kconfig && ${MAKE} mconf @echo "done." @touch .done @@ -30,16 +34,16 @@ install: all @ln -sf ${instdir}/bin/ptxdist ${DESTDIR}${prefix}/bin/ptxdist clean: - @test ! -f ${abs_srcdir}/scripts/lxdialog/Makefile || (cd ${abs_srcdir}/scripts/lxdialog && make clean) + @test ! -f ${abs_srcdir}/scripts/lxdialog/Makefile || (cd ${abs_srcdir}/scripts/lxdialog && ${MAKE} clean) @rm -f ${abs_srcdir}/scripts/lxdialog/Makefile - @cd ${abs_srcdir}/scripts/kconfig && make clean + @cd ${abs_srcdir}/scripts/kconfig && ${MAKE} clean @rm -f .done dist: PTXDIST_TOPDIR=$(shell pwd); \ tmpdir=`mktemp -d /tmp/ptxdist.XXXXXX`; \ cp -a $$PTXDIST_TOPDIR $$tmpdir/ptxdist-$(version); \ - cd $$tmpdir/ptxdist-$(version); make distclean; \ + cd $$tmpdir/ptxdist-$(version); ${MAKE} distclean; \ find $$tmpdir/ptxdist-$(version) -name ".svn" | xargs rm -fr; \ rm -f $$tmpdir/ptxdist-$(version)/.done; \ cd $$tmpdir; \ diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index cb3f30850..d65a17b4c 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -17,6 +17,10 @@ # take care of toolchain requirements # +# make sure bash is used to execute commands from makefiles + +SHELL=bash +export SHELL # This makefile is called with PTXDIST_TOPDIR set to the PTXdist # toplevel installation directory. So we first source the static diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index f140d3a9b..bc5f8cecf 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -237,7 +237,7 @@ ruby: .ruby .ruby/kconfig.so cd .ruby; ruby ../extconf.rb .ruby/kconfig.so: .ruby/kconfig_wrap.c .ruby/Makefile - make -C .ruby + ${MAKE} -C .ruby PYTHON_INCLUDE=$(shell python -c "import sys; print '-I'+sys.prefix+'/include/python'+sys.version[:3]") |