diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2017-02-06 07:29:59 +0300 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2017-02-17 09:21:12 +0300 |
| commit | 9f2d46e6611d30f9c97ae671068e6762476782e7 (patch) | |
| tree | 03af68b2c2ae5772843c39cb452a4338bb9b61f1 | |
| parent | de9383b3de27d08da288697f6f6113b69062e4cd (diff) | |
Remove all references to GOT_PREFIX
The build system behavior should not change in unexpected ways when the
user specifies installation prefix.
Tests should be using the library and the headers from the tree, not the
installed files.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 36a1480..8acfec3 100644 --- a/configure.ac +++ b/configure.ac @@ -13,8 +13,6 @@ PKG_INSTALLDIR # Use silent rules by default if supported by Automake m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"]) - AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests], [Build install tests (default: no)]), [], [enable_tests=no]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5bc1685..675a800 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,11 +4,6 @@ EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = -if GOT_PREFIX -EXTRA_INCLUDES += -I$(prefix)/include -EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib -endif - AM_CPPFLAGS = \ -I$(top_srcdir)/include \ $(EXTRA_INCLUDES) |