libextractor

commit 807adc01dc9432acf1262e56ebe481c6c39046a8
parent e4d9ea2ed20757aaf4c526845907f48b373c7ccd
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 23 Mar 2015 20:52:46 +0000

-fix encoding of PLUGININSTDIR

Diffstat:
M
src/main/Makefile.am
 | 
44
+++++++++++++++++++++++---------------------

1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -1,7 +1,7 @@
 # This Makefile.am is in the public domain
 SUBDIRS  = .
 
-INCLUDES = -I$(top_srcdir)/src/include 
+INCLUDES = -I$(top_srcdir)/src/include
 
 LIBS = \
  @LE_LIBINTL@ @LE_LIB_LIBS@
@@ -12,7 +12,7 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libextractor.la 
+  libextractor.la
 
 bin_PROGRAMS = extract
 
@@ -36,6 +36,9 @@ if HAVE_GNU_LD
  makesymbolic=-Wl,-Bsymbolic
 endif
 
+# install plugins under:
+plugindir = $(libdir)/@RPLUGINDIR@
+
 PLUGINFLAGS = $(makesymbolic) $(LE_PLUGIN_LDFLAGS)
 
 EXTRA_DIST = \
@@ -64,7 +67,7 @@ libextractor_la_LIBADD = \
 
 extract_SOURCES = \
   extract.c \
-  getopt.c getopt.h getopt1.c 
+  getopt.c getopt.h getopt1.c
 extract_DEPENDENCIES = \
   libextractor.la
 extract_LDADD = \
@@ -75,17 +78,17 @@ TESTS_ENVIRONMENT += bindir=${bindir}
 
 noinst_LTLIBRARIES = \
   libextractor_test.la \
-  libextractor_test2.la 
+  libextractor_test2.la
 
 libextractor_test_la_SOURCES = \
-  test_extractor.c 
+  test_extractor.c
 libextractor_test_la_LDFLAGS = \
   $(PLUGINFLAGS) -rpath /nowhere
 libextractor_test_la_LIBADD = \
   $(LE_LIBINTL) $(XLIB)
 
 libextractor_test2_la_SOURCES = \
-  test2_extractor.c 
+  test2_extractor.c
 libextractor_test2_la_LDFLAGS = \
   $(PLUGINFLAGS) -rpath /nowhere
 libextractor_test2_la_LIBADD = \
@@ -106,37 +109,36 @@ TESTS = $(check_PROGRAMS)
 endif
 
 test_trivial_SOURCES = \
- test_trivial.c 
+ test_trivial.c
 test_trivial_LDADD = \
- $(top_builddir)/src/main/libextractor.la  
+ $(top_builddir)/src/main/libextractor.la
 
 test_plugin_loading_SOURCES = \
- test_plugin_loading.c 
+ test_plugin_loading.c
 test_plugin_loading_LDADD = \
- $(top_builddir)/src/main/libextractor.la  
+ $(top_builddir)/src/main/libextractor.la
 
 test_plugin_load_multi_SOURCES = \
- test_plugin_load_multi.c 
+ test_plugin_load_multi.c
 test_plugin_load_multi_LDADD = \
- $(top_builddir)/src/main/libextractor.la  
+ $(top_builddir)/src/main/libextractor.la
 
 test_ipc_SOURCES = \
- test_ipc.c 
+ test_ipc.c
 test_ipc_LDADD = \
- $(top_builddir)/src/main/libextractor.la  
+ $(top_builddir)/src/main/libextractor.la
 
 test_file_SOURCES = \
- test_file.c 
+ test_file.c
 test_file_LDADD = \
- $(top_builddir)/src/main/libextractor.la  
+ $(top_builddir)/src/main/libextractor.la
 
 test_gzip_SOURCES = \
- test_gzip.c 
+ test_gzip.c
 test_gzip_LDADD = \
- $(top_builddir)/src/main/libextractor.la  
+ $(top_builddir)/src/main/libextractor.la
 
 test_bzip2_SOURCES = \
- test_bzip2.c 
+ test_bzip2.c
 test_bzip2_LDADD = \
- $(top_builddir)/src/main/libextractor.la  
-
+ $(top_builddir)/src/main/libextractor.la