--- rpl/rplcas/Makefile.in 2019/02/04 09:21:45 1.56 +++ rpl/rplcas/Makefile.in 2019/02/22 17:02:14 1.58 @@ -103,34 +103,21 @@ lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a for i in $(shell find @COCOA@ -name "*" -exec grep /bin/bash {} /dev/null \; | cut -d: -f1); \ do \ sed '1,1s/^#! *\/bin\/bash/#!@BASH@/g' $$i > $$i.2; \ - mv -f $$i.2 $$i; \ - chmod 755 $$i; \ - done - sed 's/^SHELL=\/bin\/bash/SHELL=@BASH@/g' \ - @COCOA@/configuration/autoconf.mk \ - > @COCOA@/configuration/autoconf.mk2 - mv -f @COCOA@/configuration/autoconf.mk2 \ - @COCOA@/configuration/autoconf.mk - chmod 755 @COCOA@/configuration/autoconf.mk - if [ ! -f @COCOA@/configuration/autoconf.mk ]; then \ - if [ @BUILD@ = @HOST@ ]; then \ - (cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - ./configure --with-libgmp=../lib/libgmp.a \ - --with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \ - else \ - (cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - ./configure --with-libgmp=../lib/libgmp.a \ - --with-cxx=@HOST@-g++ \ - --with-cxxflags="@SYSROOT@ $(CXXFLAGS)" \ - --with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \ - fi; \ - fi - for i in $(shell find @COCOA@ -name "*" -exec grep /bin/bash {} /dev/null \; | cut -d: -f1); \ - do \ - sed '1,1s/^#! *\/bin\/bash/#!@BASH@/g' $$i > $$i.2; \ - mv -f $$i.2 $$i; \ + sed '1,$$s/SHELL=\/bin\/bash/SHELL=@BASH@/g' $$i.2 > $$i; \ + \rm -f $$i.2; \ chmod 755 $$i; \ done + if [ @BUILD@ = @HOST@ ]; then \ + (cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + ./configure --with-libgmp=../lib/libgmp.a \ + --with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \ + else \ + (cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + ./configure --with-libgmp=../lib/libgmp.a \ + --with-cxx=@HOST@-g++ \ + --with-cxxflags="@SYSROOT@ $(CXXFLAGS)" \ + --with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \ + fi; \ $(MAKE) -C @COCOA@ $(AM_MAKEFLAGS) library cp @COCOA@/lib/libcocoa.a lib/libcocoa.a cp -R @COCOA@/include/CoCoA include