Make APA Octave pkg installable

Author: siko1056

DESCRIPTION

@@ -1,6 +1,6 @@
 name: apa
-version: 0.0.1
-date: 2021-07-01
+version: 0.1.1
+date: 2021-08-10
 author: Kai T. Ohlhus <[email protected]>
 maintainer: Kai T. Ohlhus <[email protected]>
 title: Octave/Matlab arbitrary precision arithmetic.

README.md

@@ -2,13 +2,22 @@
 
 ## Installation
 
-From the Octave/Matlab command-line run:
+From the Octave command-line run:
+
+```octave
+pkg install 'https://github.com/gnu-octave/apa/releases/download/v0.1.1/apa-0.1.1.zip'
+pkg load apa
+install_apa
+test_apa
+```
+
+From the Matlab command-line run (also works for Octave):
 
 ```matlab
-urlwrite ('https://github.com/gnu-octave/apa/releases/download/v0.1.0/apa-0.1.0.zip', ...
-          'apa-0.1.0.zip');
-unzip ('apa-0.1.0.zip');
-cd (fullfile ('apa-0.1.0', 'inst'))
+urlwrite ('https://github.com/gnu-octave/apa/releases/download/v0.1.1/apa-0.1.1.zip', ...
+          'apa-0.1.1.zip');
+unzip ('apa-0.1.1.zip');
+cd (fullfile ('apa-0.1.1', 'inst'))
 install_apa
 test_apa
 ```

doc/MEX_INTERFACE.md

@@ -7,18 +7,13 @@ and UNIX (Linux).
 
 If those pre-compiled libraries are missing or not working, please read below.
 
-From Octave call:
-
-```octave
-pkg load apa
-install_apa
-test_apa
-```
-
-From Matlab call:
+From the Octave/Matlab command-line run:
 
 ```matlab
-cd /path/to/apa/inst
+urlwrite ('https://github.com/gnu-octave/apa/releases/download/v0.1.1/apa-0.1.1.zip', ...
+          'apa-0.1.1.zip');
+unzip ('apa-0.1.1.zip');
+cd (fullfile ('apa-0.1.1', 'inst'))
 install_apa
 test_apa
 ```
@@ -59,7 +54,8 @@ The APA MEX interface is known to work and tested for
 For macOS and UNIX/Linux systems (Octave or Matlab) this can be conveniently
 done by calling:
 ```matlab
-cd apa/inst/mex
+cd (fileparts (which ('install_apa.m')));  % 'apa/inst'
+cd mex
 system ('make')
 ```
 

inst/mex/Makefile

@@ -8,21 +8,31 @@ BUILD_DIR := ${INST_DIR}/.build
 ENSURE_BUILD_DIR := $(shell mkdir -p ${BUILD_DIR})
 
 GMP_DIR = gmp-${GMP_VER}
-GMP_TAR = ${GMP_DIR}.tar.gz
+GMP_TAR = ${GMP_DIR}.tar.bz2
+GMP_URL = https://gmplib.org/download/gmp/${GMP_TAR}
 GMP_PATH = ${BUILD_DIR}/${GMP_DIR}
 
 MPFR_DIR = mpfr-${MPFR_VER}
 MPFR_TAR = ${MPFR_DIR}.tar.gz
+MPFR_URL = https://www.mpfr.org/mpfr-4.1.0/${MPFR_TAR}
 MPFR_PATH = ${BUILD_DIR}/${MPFR_DIR}
 
+CURL_OPTS = --fail --location --silent --show-error --output
+
 HEADER = gmp.h mpfr.h mpf2mpfr.h
 STATIC_LIBS = libgmp.a libmpfr.a
 
 all: $(patsubst %,${BUILD_DIR}/lib/%,${STATIC_LIBS})
 	cp $(patsubst %,${BUILD_DIR}/lib/%,${STATIC_LIBS}) ${INST_DIR}
 	cp $(patsubst %,${BUILD_DIR}/include/%,${HEADER})  ${INST_DIR}
 
-${BUILD_DIR}/lib/libgmp.a: ${INST_DIR}/src/${GMP_TAR}
+${BUILD_DIR}/${GMP_TAR}:
+	curl ${CURL_OPTS} ${BUILD_DIR}/${GMP_TAR} ${GMP_URL}
+
+${BUILD_DIR}/${MPFR_TAR}:
+	curl ${CURL_OPTS} ${BUILD_DIR}/${MPFR_TAR} ${MPFR_URL}
+
+${BUILD_DIR}/lib/libgmp.a: ${BUILD_DIR}/${GMP_TAR}
 	$(RM) -R ${GMP_PATH}
 	cd ${BUILD_DIR} && tar -xf $<
 	cd ${GMP_PATH} && ./configure \
@@ -33,7 +43,7 @@ ${BUILD_DIR}/lib/libgmp.a: ${INST_DIR}/src/${GMP_TAR}
 	cd ${GMP_PATH} && $(MAKE) check
 	cd ${GMP_PATH} && $(MAKE) install
 
-${BUILD_DIR}/lib/libmpfr.a: ${INST_DIR}/src/${MPFR_TAR} ${BUILD_DIR}/lib/libgmp.a
+${BUILD_DIR}/lib/libmpfr.a: ${BUILD_DIR}/${MPFR_TAR} ${BUILD_DIR}/lib/libgmp.a
 	$(RM) -R ${MPFR_PATH}
 	cd ${BUILD_DIR} && tar -xf $<
 	cd ${MPFR_PATH} && ./configure \