summaryrefslogtreecommitdiffstats
path: root/ipa-server/ipa-slapi-plugins
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2007-08-15 19:45:18 -0400
committerSimo Sorce <ssorce@redhat.com>2007-08-15 19:45:18 -0400
commit1e59adbe451680f9ab56323802538804dcfb5180 (patch)
tree4291a5114df5757207548ef9e8c4febff35d6854 /ipa-server/ipa-slapi-plugins
parent9faa5ce77e9323c9060868ab0f55c0b3cb98ff70 (diff)
downloadfreeipa-1e59adbe451680f9ab56323802538804dcfb5180.tar.gz
freeipa-1e59adbe451680f9ab56323802538804dcfb5180.tar.xz
freeipa-1e59adbe451680f9ab56323802538804dcfb5180.zip
in F7 all directory names have changed from fedora-ds to dirsrv
which should also be the name used in DS 8.0, change all occurences
Diffstat (limited to 'ipa-server/ipa-slapi-plugins')
-rw-r--r--ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile9
-rw-r--r--ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile9
-rw-r--r--ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c2
3 files changed, 11 insertions, 9 deletions
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile
index 05d4df0f2..b94f1d8c8 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile
+++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile
@@ -1,12 +1,13 @@
+DIRSRV ?= dirsrv
PREFIX ?= $(DESTDIR)/usr
-LIBDIR ?= $(PREFIX)/lib/fedora-ds/plugins
-LIB64DIR ?= $(PREFIX)/lib64/fedora-ds/plugins
+LIBDIR ?= $(PREFIX)/lib/$(DIRSRV)/plugins
+LIB64DIR ?= $(PREFIX)/lib64/$(DIRSRV)/plugins
SHAREDIR = $(DESTDIR)/usr/share/ipa
SONAME = libipa-memberof-plugin.so
LDFLAGS += -llber
CFLAGS ?= -Wall -Wshadow -O2
-CFLAGS += -I/usr/include/fedora-ds -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
+CFLAGS += -I/usr/include/$(DIRSRV) -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
@@ -18,7 +19,7 @@ all: $(OBJS)
install:
-mkdir -p $(LIBDIR)
- if [ -e $(PREFIX)/lib/fedora-ds ]; then \
+ if [ -e $(PREFIX)/lib/$(DIRSRV) ]; then \
install -m 644 $(SONAME) $(LIBDIR); \
else \
install -m 644 $(SONAME) $(LIB64DIR); \
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
index f3c2078e0..0b6443191 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile
@@ -1,12 +1,13 @@
+DIRSRV ?= dirsrv
PREFIX ?= $(DESTDIR)/usr
-LIBDIR = $(PREFIX)/lib/fedora-ds/plugins
-LIB64DIR ?= $(PREFIX)/lib64/fedora-ds/plugins
+LIBDIR = $(PREFIX)/lib/$(DIRSRV)/plugins
+LIB64DIR ?= $(PREFIX)/lib64/$(DIRSRV)/plugins
SHAREDIR = $(DESTDIR)/usr/share/ipa
SONAME = libipa_pwd_extop.so
LDFLAGS += -lkrb5 -llber -lldap -lmhash -llber -lssl
CFLAGS ?= -Wall -Wshadow -O2
-CFLAGS += -I/usr/include/fedora-ds -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
+CFLAGS += -I/usr/include/$(DIRSRV) -I/usr/include/nss3 -I/usr/include/mozldap -I/usr/include/nspr4 -fPIC -DPIC
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
@@ -18,7 +19,7 @@ all: $(OBJS)
install:
-mkdir -p $(LIBDIR)
- if [ -e $(PREFIX)/lib/fedora-ds ]; then \
+ if [ -e $(PREFIX)/lib/$(DIRSRV) ]; then \
install -m 644 $(SONAME) $(LIBDIR); \
else \
install -m 644 $(SONAME) $(LIB64DIR); \
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index 298d9164d..b4dafb847 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -61,7 +61,7 @@
#include <prio.h>
#include <ssl.h>
-#include <slapi-plugin.h>
+#include <dirsrv/slapi-plugin.h>
#include <krb5.h>
#include <lber.h>
#include <time.h>