23 lines
770 B
Diff
23 lines
770 B
Diff
commit 43cc36abff0fbaa5b5b434ca17b4b74f45dad98a
|
|
Author: Nathan Scott <nathans@redhat.com>
|
|
Date: Thu Jan 9 16:01:18 2020 +1100
|
|
|
|
build: ensure generated demo Makefile matches on 32/64 Linux
|
|
|
|
This corrects a multilib issue with the pcp-devel RPMs.
|
|
Resolves Red Hat bugzilla #1788119
|
|
|
|
diff --git a/src/pmdas/trace/GNUmakefile b/src/pmdas/trace/GNUmakefile
|
|
index b7087d017..b5e0589ad 100644
|
|
--- a/src/pmdas/trace/GNUmakefile
|
|
+++ b/src/pmdas/trace/GNUmakefile
|
|
@@ -101,7 +101,7 @@ MY_INC_DIR = -I$(PCP_INC_DIR)/..
|
|
else
|
|
MY_INC_DIR =
|
|
endif
|
|
-ifneq "$(PCP_LIB_DIR)" "/usr/lib"
|
|
+ifeq "$(findstring $(PCP_LIB_DIR), /usr/lib /usr/lib64)" ""
|
|
# for ld add -L<run-time-lib-dir> and include -rpath when
|
|
# $(PCP_LIB_DIR) may not be on the default ld search path.
|
|
#
|