Replace libdir by a dedicated variable, and add support for DESTDIR.

INSTALL.md

@@ -24,8 +24,8 @@ to set the Coq compiler command. The configure script defaults to `coqc`.
 Similarly, `COQDEP` can be used to specify the location of `coqdep`. The
 `COQBIN` environment variable can be used to set both variables at once.
 
-The option `--libdir=DIR` can be set to the directory where the compiled
-library files should be installed by `./remake install`. By default, the
-target directory is `` `$COQC -where`/user-contrib/Flocq ``.
-
-The files are compiled at a logical location starting with `Flocq`.
+The library files are compiled at the logical location `Flocq`. The
+`COQUSERCONTRIB` environment variable can be used to override the
+physical location where the `Flocq` directory containing these files will
+be installed by `./remake install`. By default, the target directory is
+`` `$COQC -where`/user-contrib ``.

Remakefile.in

@@ -127,13 +127,12 @@ public: deps.png deps.map html/index.html
 	cp -r html deps.png public/
 
 install:
-	prefix=@prefix@
-	exec_prefix=@exec_prefix@
-	mkdir -p @libdir@
-	for d in Core Calc Prop IEEE754 Pff; do mkdir -p @libdir@/$d; done
-	for f in $(OBJS); do cp $f @libdir@/${f#src/}; done
-	for f in $(FILES); do cp src/$f @libdir@/$f; done
-	( cd src && find . -type d -name ".coq-native" -exec cp -RT "{}" "@libdir@/{}" \; )
+	dir="${DESTDIR}@COQUSERCONTRIB@/Flocq"
+	mkdir -p $dir
+	for d in Core Calc Prop IEEE754 Pff; do mkdir -p $dir/$d; done
+	for f in $(OBJS); do cp $f $dir/${f#src/}; done
+	for f in $(FILES); do cp src/$f $dir/$f; done
+	( cd src && find . -type d -name ".coq-native" -exec cp -RT "{}" "$dir/{}" \; )
 
 EXTRA_DIST = \
 	configure

configure.in

@@ -8,11 +8,6 @@ if test "$ac_init_help" = "long"; then
 fi
 m4_divert_pop(99)
 
-m4_divert_push([HELP_ENABLE])
-Fine tuning of the installation directory:
-AS_HELP_STRING([--libdir=DIR], [library @<:@DIR=`$COQC -where`/user-contrib/Flocq@:>@])
-m4_divert_pop([HELP_ENABLE])
-
 AC_PROG_CXX
 
 AC_DEFUN([AX_VERSION_GE], [AS_VERSION_COMPARE([$1],[$2],[$4],[$3],[$3])])
@@ -70,8 +65,10 @@ AC_MSG_RESULT([$COQDOC])
 
 AC_ARG_VAR(COQEXTRAFLAGS, [extra flags passed to Coq compiler [empty]])
 
-if test "$libdir" = '${exec_prefix}/lib'; then
-  libdir="`$COQC -where | tr -d '\r' | tr '\\\\' '/'`/user-contrib/Flocq"
+AC_ARG_VAR(COQUSERCONTRIB, [installation directory [`$COQC -where`/user-contrib]])
+
+if test -z "$COQUSERCONTRIB"; then
+  COQUSERCONTRIB="`$COQC -where | tr -d '\r' | tr '\\\\' '/'`/user-contrib"
 fi
 
 AC_MSG_NOTICE([building remake...])