Commit b1f40f95 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Portability fixes from HEAD

parent fe977e2d
......@@ -30,7 +30,17 @@ INCS=$(LDAP_INC) $(NLDAPD_INC)
LDAP_LIB=-lldap_r -llber
LIBS=$(LDAP_LIB)
all: nssov.la
prefix=/usr/local
exec_prefix=$(prefix)
ldap_subdir=/openldap
libdir=$(exec_prefix)/lib
libexecdir=$(exec_prefix)/libexec
moduledir = $(libexecdir)$(ldap_subdir)
sysconfdir = $(prefix)/etc$(ldap_subdir)
schemadir = $(sysconfdir)/schema
all: install
XOBJS = tio.lo
......@@ -49,4 +59,12 @@ $(OBJS): nssov.h
nssov.la: $(OBJS) $(XOBJS)
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-rpath /usr/local/libexec/openldap -module -o $@ $(OBJS) $(XOBJS) $(LIBS)
-rpath $(libdir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS)
install: nssov.la
mkdir -p $(DESTDIR)$(moduledir)
$(LIBTOOL) --mode=install cp nssov.la $(DESTDIR)$(moduledir)
cp ldapns.schema $(DESTDIR)$(schemadir)
clean:
rm -f *.*o *.la .libs/*
......@@ -29,6 +29,14 @@ SSL_LIB=-lcrypto
LDAP_LIB=-lldap_r -llber
LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
prefix=/usr/local
exec_prefix=$(prefix)
ldap_subdir=/openldap
libdir=$(exec_prefix)/lib
libexecdir=$(exec_prefix)/libexec
moduledir = $(libexecdir)$(ldap_subdir)
all: smbk5pwd.la
......@@ -37,12 +45,11 @@ smbk5pwd.lo: smbk5pwd.c
smbk5pwd.la: smbk5pwd.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-rpath $(PREFIX)/lib -module -o $@ $? $(LIBS)
-rpath $(libdir) -module -o $@ $? $(LIBS)
clean:
rm -f smbk5pwd.lo smbk5pwd.la
install: smbk5pwd.la
mkdir -p $(PREFIX)/lib/openldap
$(LIBTOOL) --mode=install cp smbk5pwd.la $(PREFIX)/lib/openldap
$(LIBTOOL) --finish $(PREFIX)/lib
mkdir -p $(DESTDIR)$(moduledir)
$(LIBTOOL) --mode=install cp smbk5pwd.la $(DESTDIR)$(moduledir)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment