diff options
| author | Karl MacMillan <kmacmill@redhat.com> | 2007-10-09 16:25:38 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmill@redhat.com> | 2007-10-09 16:25:38 -0400 |
| commit | d2a19b200912fe4a78211a3d6212b143ece5e064 (patch) | |
| tree | f6a07686c2a4b4cb82d288d8ce8a14a454d9776e /ipa-server/ipa-slapi-plugins | |
| parent | aaa992b74405f41e2f51d1fb2946c57303c3de07 (diff) | |
| download | freeipa-d2a19b200912fe4a78211a3d6212b143ece5e064.tar.gz freeipa-d2a19b200912fe4a78211a3d6212b143ece5e064.tar.xz freeipa-d2a19b200912fe4a78211a3d6212b143ece5e064.zip | |
Karl MacMillan wrote:
> > This largish patch makes the build and installation work on 64bit
> > machines. The only catch here is that to get a 64bit build you need to
> > set LIBDIR on make:
> >
> > make install LIBDIR=/usr/lib64
> >
> > The spec file does this correctly. I couldn't find any reliable way to
> > guess this that works both on real systems and in the almost entirely
> > empty rpm build root (you can't, for example, check for the existence
> > of /usr/lib64).
Diffstat (limited to 'ipa-server/ipa-slapi-plugins')
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/dna/Makefile | 15 | ||||
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile | 15 | ||||
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile | 15 |
3 files changed, 9 insertions, 36 deletions
diff --git a/ipa-server/ipa-slapi-plugins/dna/Makefile b/ipa-server/ipa-slapi-plugins/dna/Makefile index a4fccab23..1e37d7793 100644 --- a/ipa-server/ipa-slapi-plugins/dna/Makefile +++ b/ipa-server/ipa-slapi-plugins/dna/Makefile @@ -1,12 +1,7 @@ -DIRSRV ?= dirsrv -PREFIX ?= $(DESTDIR)/usr -LIBDIR ?= $(PREFIX)/lib/$(DIRSRV)/plugins -LIB64DIR ?= $(PREFIX)/lib64/$(DIRSRV)/plugins -SHAREDIR = $(DESTDIR)/usr/share/ipa +include ../../Makefile.common SONAME = libipa-dna-plugin.so LDFLAGS += -llber -CFLAGS ?= -g -Wall -Wshadow 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,12 +13,8 @@ all: $(OBJS) $(CC) $(CFLAGS) -c -o $@ $< install: - -mkdir -p $(LIBDIR) - if [ -e $(PREFIX)/lib/$(DIRSRV) ]; then \ - install -m 644 $(SONAME) $(LIBDIR); \ - else \ - install -m 644 $(SONAME) $(LIB64DIR); \ - fi + mkdir -p $(PLUGINDIR); \ + install -m 644 $(SONAME) $(PLUGINDIR); \ install -m 644 *.ldif $(SHAREDIR) clean: diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile index 71258e6bf..e13446c4b 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile +++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/Makefile @@ -1,12 +1,7 @@ -DIRSRV ?= dirsrv -PREFIX ?= $(DESTDIR)/usr -LIBDIR ?= $(PREFIX)/lib/$(DIRSRV)/plugins -LIB64DIR ?= $(PREFIX)/lib64/$(DIRSRV)/plugins -SHAREDIR = $(DESTDIR)/usr/share/ipa +include ../../Makefile.common SONAME = libipa-memberof-plugin.so LDFLAGS += -llber -CFLAGS ?= -g -Wall -Wshadow 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,12 +13,8 @@ all: $(OBJS) $(CC) $(CFLAGS) -c -o $@ $< install: - -mkdir -p $(LIBDIR) - if [ -e $(PREFIX)/lib/$(DIRSRV) ]; then \ - install -m 644 $(SONAME) $(LIBDIR); \ - else \ - install -m 644 $(SONAME) $(LIB64DIR); \ - fi + mkdir -p $(PLUGINDIR); \ + install -m 644 $(SONAME) $(PLUGINDIR); \ install -m 644 *.ldif $(SHAREDIR) clean: diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile index 7d676146a..034b8e60b 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile +++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/Makefile @@ -1,12 +1,7 @@ -DIRSRV ?= dirsrv -PREFIX ?= $(DESTDIR)/usr -LIBDIR = $(PREFIX)/lib/$(DIRSRV)/plugins -LIB64DIR ?= $(PREFIX)/lib64/$(DIRSRV)/plugins -SHAREDIR = $(DESTDIR)/usr/share/ipa +include ../../Makefile.common SONAME = libipa_pwd_extop.so LDFLAGS += -lkrb5 -llber -lldap -llber -lssl -CFLAGS ?= -g -Wall -Wshadow 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,12 +13,8 @@ all: $(OBJS) $(CC) $(CFLAGS) -c -o $@ $< install: - -mkdir -p $(LIBDIR) - if [ -e $(PREFIX)/lib/$(DIRSRV) ]; then \ - install -m 644 $(SONAME) $(LIBDIR); \ - else \ - install -m 644 $(SONAME) $(LIB64DIR); \ - fi + mkdir -p $(PLUGINDIR); \ + install -m 644 $(SONAME) $(PLUGINDIR); \ install -m 644 *.ldif $(SHAREDIR) clean: |