--- rpl/Makefile.am 2013/03/04 09:48:19 1.63 +++ rpl/Makefile.am 2013/03/18 11:48:27 1.66 @@ -4,7 +4,7 @@ SUBDIRS = tools rplsums rpliconv rplawk include_HEADERS = rplconfig.h EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \ - COPYING.in lapack/COPYING lapack/RELEASE autogen.sh \ + HEADER.in lapack/COPYING lapack/RELEASE autogen.sh \ tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \ vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \ examples/external.tar.gz DEBIAN/control.in \ @@ -12,7 +12,7 @@ EXTRA_DIST = LIMITATIONS Licence_CeCILL_ rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz all: - @if [ -n $(shell $(MAKE) -v | grep "^GNU Make") ]; then \ + @if [ x$(shell $(MAKE) -v | grep "^GNU Make") != x ]; then \ echo; \ echo MAKE=$(MAKE); \ echo "Please use GNU Make !"; \ @@ -22,7 +22,7 @@ all: $(MAKE) all-rpl licences: - cp -f $(top_builddir)/COPYING $(srcdir) + cp -f $(top_builddir)/HEADER $(srcdir) $(MAKE) -C src $@ purge: @@ -227,7 +227,8 @@ $(top_builddir)/rplsums/rplmd5sum$(EXEEX $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT): $(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS) -$(top_builddir)/tools/@UNITS@/units$(EXEEXT): +$(top_builddir)/tools/@UNITS@/units$(EXEEXT) \ + $(top_builddir)/tools/@UNITS@/units_cur: if [ @OS@ = OpenBSD ]; then \ TMP=tmp.units; \ sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \