diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-28 14:26:36 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-28 14:26:36 +0000 |
| commit | 8a882a6dfe5e0e97dd2f820278ef3b7de065203b (patch) | |
| tree | 24c54194b495c48c1570ea1cf8291e52d00933b5 | |
| parent | 5d9f11fe81eaca3989ec7e8dbfe5b31608a75121 (diff) | |
| download | googletest-8a882a6dfe5e0e97dd2f820278ef3b7de065203b.tar.gz | |
Revert "disables 'make install'"
This reverts commit 9777673650126252f9de8447e0ea4f4e451d1ce4.
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 104c54e..bb6230a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -160,6 +160,10 @@ EXTRA_DIST += \ codegear/gtest_main.cbproj \ codegear/gtest_unittest.cbproj +# Scripts and utilities +bin_SCRIPTS = scripts/gtest-config +CLEANFILES = $(bin_SCRIPTS) + # Distribute and install M4 macro m4datadir = $(datadir)/aclocal m4data_DATA = m4/gtest.m4 @@ -289,16 +293,4 @@ endif # Death tests may produce core dumps in the build directory. In case # this happens, clean them to keep distcleancheck happy. -CLEANFILES = core - -# Disables 'make install' as installing a compiled version of Google -# Test can lead to undefined behavior due to violation of the -# One-Definition Rule. - -install-exec-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." - false - -install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." - false +CLEANFILES += core |