Fix Makevars issue

graemeleehickey · Feb 4, 2025 · 5c68c4f · 5c68c4f
1 parent 06ddf4c
commit 5c68c4f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -0,0 +1,3 @@
+Version: 0.4.7
+Date: 2025-02-04 15:50:07 UTC
+SHA: 06ddf4c329c71fd33a8e625473bac3b38bd1ea8b
diff --git a/NEWS.md b/NEWS.md
@@ -26,8 +26,6 @@
 
 -   Imported `RcppArmadillo` functions `armadillo_throttle_cores` and `armadillo_reset_cores` to try and prevent CRAN R CMD checks using multiple threads.
 
--   Updated Makevars (now Makevars.in) and Makevars.win as part of previous update.
-
 # joineRML 0.4.6
 
 ## Housekeeping

diff --git a/src/Makevars b/src/Makevars
@@ -0,0 +1,2 @@
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.in b/src/Makevars.in
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,2 +1,2 @@
-PKG_CXXFLAGS = -I../inst/include -I. $(SHLIB_OPENMP_CXXFLAGS)
-PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
		PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)