allow PAPI to be installed somewhere non-standard

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 783f4f9..e19a1cd 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -468,7 +468,8 @@ GhcRtsWithFrontPanel = NO
 # Include support for CPU performance counters via the PAPI library in the RTS?
 # (PAPI: http://icl.cs.utk.edu/papi/)
 GhcRtsWithPapi = NO
-HavePapi = @HavePapi@
+PapiLibDir=
+PapiIncludeDir=
 
 ################################################################################
 #

diff --git a/rts/Makefile b/rts/Makefile
index 9437253..7d12d0b 100644 (file)
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -277,9 +277,23 @@ endif
 # Add PAPI library if needed
 
 ifeq "$(GhcRtsWithPapi)" "YES"
+
 SRC_HC_OPTS            += -optc-DUSE_PAPI
 PACKAGE_CPP_OPTS       += -DUSE_PAPI
+
+PACKAGE_CPP_OPTS += -DPAPI_INCLUDE_DIR=$(PapiIncludeDir)
+PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR=$(PapiLibDir)
+
+ifneq "$(PapiIncludeDir)" ""
+SRC_HC_OPTS += -I$(PapiIncludeDir)
+SRC_CC_OPTS += -I$(PapiIncludeDir)
+SRC_HSC2HS_OPTS += -I$(PapiIncludeDir)
 endif
+ifneq "$(PapiLibDirs)" ""
+SRC_LD_OPTS += -L$(PapiLibDirs)
+endif
+
+endif # GhcRtsWithPapi==YES
 
 #-----------------------------------------------------------------------------
 # make depend setup

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 7e0ee02..557bb99 100644 (file)
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -15,13 +15,13 @@ hidden-modules:
 import-dirs:
 
 #ifdef INSTALLING
-library-dirs:          LIB_DIR GMP_LIB_DIRS
+library-dirs:          LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
 # ifdef mingw32_HOST_OS
                        , LIB_DIR"/gcc-lib"
                        /* force the dist-provided gcc-lib/ into scope. */
 # endif
 #else /* !INSTALLING */
-library-dirs:          FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS
+library-dirs:          FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
 # if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
                        , FPTOOLS_TOP_ABS"/gmp"
 # endif
@@ -60,7 +60,7 @@ extra-libraries:              "m"             /* for ldexp() */
 #endif
 
 #ifdef INSTALLING
-include-dirs:          INCLUDE_DIR GMP_INCLUDE_DIRS
+include-dirs:          INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
 # ifdef mingw32_HOST_OS
                        , INCLUDE_DIR"/mingw"
 # endif