diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-10-16 08:32:41 +0300 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-10-16 08:35:10 +0300 |
| commit | 257cc98a5ab9cab0472f9ec9debb41ec4a7a3096 (patch) | |
| tree | 0de8a8b50cda65b4a39bf7fa23cfb84e59a1a0c9 | |
| parent | 719594910286c23448ecb969ac3c33047046b400 (diff) | |
Don't use prefix for anything but installation
There are other, standard ways to specify path to includes and libraries.
In particular, setting rpath should not be needed with libtool.
Don't change sysconfdir. It's not used and should not be generally used
by a library.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
3 files changed, 0 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 3f68ce5..c7da699 100644 --- a/configure.ac +++ b/configure.ac @@ -9,12 +9,6 @@ AC_PROG_CC AC_C_CONST AC_PROG_LIBTOOL -AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"]) - -if test "x${prefix}" = "xNONE" ; then -sysconfdir="/etc"; -fi - # SIMD is optional AC_ARG_WITH([simd], AC_HELP_STRING([--without-simd],[Omit SIMD extensions.])) diff --git a/src/Makefile.am b/src/Makefile.am index a027d5f..fda0d31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,11 +31,6 @@ EXTRA_ENCODE_SRC += $(X86_ASM) EXTRA_DEFINES += -DSIMD_USE_ACCEL=1 -DRFX_USE_ACCEL_X86=1 endif -if GOT_PREFIX -EXTRA_INCLUDES += -I$(prefix)/include -EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib -endif - AM_CFLAGS = \ -I$(top_srcdir)/include \ -I../include \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 59246dc..e533bcb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,11 +5,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 - INCLUDES = \ -I$(top_srcdir)/include \ $(EXTRA_INCLUDES) |