--- rpl/rplcas/Makefile.in 2019/02/05 10:40:34 1.57 +++ rpl/rplcas/Makefile.in 2019/10/29 16:57:10 1.60 @@ -95,7 +95,12 @@ lib/ntl.a: \mv -f WizardAux2 WizardAux; \ fi && \ $(MAKE) $(AM_MAKEFLAGS) -f makefile) - cp @NTL@/src/ntl.a lib/ntl.a + if [ ! -d lib ]; then \ + mkdir lib; \ + fi; \ + if [ ! -d include ]; then \ + mkdir include; \ + fi; \ cp @NTL@/src/ntl.a lib/ntl.a cp -R @NTL@/include/NTL include @@ -103,7 +108,8 @@ 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; \ + sed '1,$$s/SHELL=\/bin\/bash/SHELL=@BASH@/g' $$i.2 > $$i; \ + \rm -f $$i.2; \ chmod 755 $$i; \ done if [ @BUILD@ = @HOST@ ]; then \ @@ -117,12 +123,6 @@ lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a --with-cxxflags="@SYSROOT@ $(CXXFLAGS)" \ --with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \ 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; \ - chmod 755 $$i; \ - done $(MAKE) -C @COCOA@ $(AM_MAKEFLAGS) library cp @COCOA@/lib/libcocoa.a lib/libcocoa.a cp -R @COCOA@/include/CoCoA include @@ -162,7 +162,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@ CXX=@CXX@ \ CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ $(CPPFLAGS)" \ CXXFLAGS="$(CXXFLAGS) -fpermissive" \ - LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS)" \ + LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a" \ ../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \ --enable-pari \ --enable-ntl \ @@ -174,7 +174,7 @@ lib/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@ (cd @GIAC@ && \ CPPFLAGS="-I$(top_builddir)/rplcas/include -I$(top_builddir)/tools/@GSL@ @SYSROOT@ $(CPPFLAGS)" \ CXXFLAGS="$(CXXFLAGS) -fpermissive" \ - LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(LDFLAGS) $(LIBGIAC)" \ + LDFLAGS="$(top_builddir)/rplcas/lib/libpari.a $(top_builddir)/rplcas/lib/libcocoa.a $(top_builddir)/rplcas/lib/ntl.a $(top_builddir)/tools/@GSL@/.libs/libgsl.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfi.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@mpfr.a $(top_builddir)/rplcas/lib/@LIB_PREFIX@gmp.a $(LDFLAGS) $(LIBGIAC)" \ ../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \ --host=@HOST@ \ --enable-pari \