diff --git a/configure.win b/configure.win index 65415d92..1f66e1c7 100755 --- a/configure.win +++ b/configure.win @@ -1,2 +1,2 @@ #! /usr/bin/env sh -sh ./configure_win +sh ./configure diff --git a/configure_win b/configure_win deleted file mode 100755 index 87fb3528..00000000 --- a/configure_win +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env sh - -# adapted from https://github.com/tidyverse/purrr/blob/main/configure - -# Check that this is not just ./configure. We need to run this -# from R CMD INSTALL, to have the R env vars set. - -if [ -z "$R_HOME" ]; then -echo >&2 R_HOME is not set, are you running R CMD INSTALL? -exit 1 -fi - -# Find the R binary we need to use. This is a bit trickier on -# Windows, because it has two architectures. On windows R_ARCH_BIN -# is set, so this should work everywhere. -RBIN="${R_HOME}/bin${R_ARCH_BIN}/R" - -"$RBIN" --vanilla --slave -f tools/configure.R