diff options
| author | Povilas Kanapickas <povilas@radix.lt> | 2020-11-27 01:34:09 +0200 |
|---|---|---|
| committer | Povilas Kanapickas <povilas@radix.lt> | 2020-11-27 01:34:09 +0200 |
| commit | 866ee813335d73962e61005e191a17f7aa1299bf (patch) | |
| tree | 84ed97498da1fb80c5014aba23a89dc8eedc1c08 | |
| parent | 2bd7d712bd93e71fdd9c3e834f51871d31ebc518 (diff) | |
gtest: Make sure to not clobber system-installed gtest
| -rw-r--r-- | gtest/include/Makefile.am | 1 | ||||
| -rw-r--r-- | xorg-gtest.pc.in | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gtest/include/Makefile.am b/gtest/include/Makefile.am index 956e681..3b3afb3 100644 --- a/gtest/include/Makefile.am +++ b/gtest/include/Makefile.am @@ -22,6 +22,7 @@ # SOFTWARE. # +includedir = $(prefix)/include/xorg/gtest-lib nobase_include_HEADERS = \ gtest/gtest.h \ gtest/internal/gtest-filepath.h \ diff --git a/xorg-gtest.pc.in b/xorg-gtest.pc.in index 8fa18a6..c111790 100644 --- a/xorg-gtest.pc.in +++ b/xorg-gtest.pc.in @@ -1,8 +1,8 @@ prefix=@prefix@ includedir=@includedir@ sourcedir=@SOURCEDIR@ -datarootdir=@datarootdir@ -CPPflags=-I${includedir} -I${includedir}/xorg -I${sourcedir} -DDUMMY_CONF_PATH=\"@DUMMY_CONF_PATH@\" -DLOGFILE_DIR=\"@LOGFILE_DIR@\" +datarootdir=@datarootdir +CPPflags=-I${includedir} -I${includedir}/xorg -I${includedir}/xorg/gtest-lib -I${sourcedir} -DDUMMY_CONF_PATH=\"@DUMMY_CONF_PATH@\" -DLOGFILE_DIR=\"@LOGFILE_DIR@\" Name: xorg-gtest Description: X.org Google Test Environment |