diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-28 15:32:57 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-28 15:32:57 +0000 |
| commit | e04ca2f3f8df4456734de8d15a303c9f6c51102e (patch) | |
| tree | a249a275036e63f9b2a2501a2f4439a8c37acc92 | |
| parent | 917eb00f7d0cc18dbdf6276460d62d450951fafa (diff) | |
| download | googlemock-e04ca2f3f8df4456734de8d15a303c9f6c51102e.tar.gz | |
Revert "disables 'make install'"
This reverts commit ad13ffa077f66ff88249bc27d91c95acfe7d0771.
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 0afce2f..72adb99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,10 @@ EXTRA_DIST = # included in the 'subdirs' variable. SUBDIRS = $(subdirs) +# Scripts and utilities to be installed by 'make install'. +dist_bin_SCRIPTS = scripts/gmock_doctor.py +bin_SCRIPTS = scripts/gmock-config + # This is generated by the configure script, so clean it for distribution. DISTCLEANFILES = scripts/gmock-config @@ -199,15 +203,3 @@ 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 -# Mock 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 Mock into your build system." - false - -install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system." - false |