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).
This commit is contained in:
Karl MacMillan
-
parent aaa992b744
commit d2a19b2009
16 changed files with 72 additions and 87 deletions

View File

@@ -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:

View File

@@ -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:

View File

@@ -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: