From 5fc5a1bf89cd6c76be869fc09eb83197efdd2335 Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Wed, 17 Jan 2007 22:40:48 +0000 Subject: no longer install libc-versioned symlink and hardcode nss soname because we will likely need to change our code if the ABI changes git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@229 ef36b2f9-881f-0410-afb5-c4e39611909c --- nss/Makefile.am | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'nss') diff --git a/nss/Makefile.am b/nss/Makefile.am index cb9cd35..ba554d5 100644 --- a/nss/Makefile.am +++ b/nss/Makefile.am @@ -2,7 +2,7 @@ # # Copyright (C) 2006 Luke Howard # Copyright (C) 2006 West Consulting -# Copyright (C) 2006 Arthur de Jong +# Copyright (C) 2006, 2007 Arthur de Jong # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -23,9 +23,7 @@ noinst_PROGRAMS = nss_ldap.so AM_CFLAGS = -fPIC # determin version numbers to use in installed files -LIBC_VERS = `ls /lib/libc-*.so | tail -n 1 |sed -e 's/\/lib\/libc-\(.*\)\.so/\1/'` -NSS_VERS = $(shell ls /lib/libnss_files.so.? | tail -n 1 | sed -e 's/\/lib\/libnss_files\.so\.\(.*\)/\1/') -NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so +NSS_VERS = 2 NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS) nss_ldap_so_SOURCES = common.c common.h prototypes.h \ @@ -41,9 +39,6 @@ EXTRA_DIST = exports.linux install-exec-local: install-nss_ldap_so -# install libnss_ldap-2.3.6.so and create libnss_ldap.so.2 symlink +# install libnss_ldap.so.2 install-nss_ldap_so: nss_ldap.so - $(INSTALL_PROGRAM) -D nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) - (cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED)) -# $(mkinstalldirs) $(DESTDIR)/usr$(libdir) -# (cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) libnss_ldap.so) + $(INSTALL_PROGRAM) -D nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_NSS_VERSIONED) -- cgit v1.2.3