diff options
| author | Christian Grothoff <christian@grothoff.org> | 2012-10-12 15:32:08 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2012-10-12 15:32:08 +0000 |
| commit | 4f7742c31bcf64550dae6a14d6b6da54d6d57e59 (patch) | |
| tree | 3eaf2f4c2f1272e817a4d23d1b642a16ae0bce05 /src/gns | |
| parent | f6bdc4c133a26084e3a4457ad8dcc27c56344bb5 (diff) | |
| download | gnunet-4f7742c31bcf64550dae6a14d6b6da54d6d57e59.tar.gz gnunet-4f7742c31bcf64550dae6a14d6b6da54d6d57e59.zip | |
-fix for #688590: allow user to specify how to install nsslibs
Diffstat (limited to 'src/gns')
| -rw-r--r-- | src/gns/nss/Makefile.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am index 0569fce7d..f2a6daac2 100644 --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am | |||
| @@ -21,20 +21,18 @@ EXTRA_DIST = map-file | |||
| 21 | 21 | ||
| 22 | AM_LDFLAGS=-avoid-version -module -export-dynamic | 22 | AM_LDFLAGS=-avoid-version -module -export-dynamic |
| 23 | 23 | ||
| 24 | if HAVE_SUDO | 24 | nssdir = $(NSS_DIR) |
| 25 | nssdir = /lib/ | ||
| 26 | else | ||
| 27 | nssdir = $(libdir) | ||
| 28 | endif | ||
| 29 | 25 | ||
| 30 | LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool | 26 | LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool |
| 31 | 27 | ||
| 32 | if !MINGW | 28 | if !MINGW |
| 29 | if INSTALL_NSS | ||
| 33 | nss_LTLIBRARIES = \ | 30 | nss_LTLIBRARIES = \ |
| 34 | libnss_gns.la \ | 31 | libnss_gns.la \ |
| 35 | libnss_gns4.la \ | 32 | libnss_gns4.la \ |
| 36 | libnss_gns6.la | 33 | libnss_gns6.la |
| 37 | endif | 34 | endif |
| 35 | endif | ||
| 38 | 36 | ||
| 39 | sources = nss_gns_query.h nss_gns_query.c | 37 | sources = nss_gns_query.h nss_gns_query.c |
| 40 | 38 | ||