fix install broken when O=<DIR> is used

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1489 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2007-11-28 18:54:54 +00:00
parent b471e97b07
commit b77d7692fe
2 changed files with 7 additions and 5 deletions

View File

@ -139,17 +139,19 @@ install: all
install -m 755 $(builddir)exec/libtotem_pg.so.2.* $(DESTDIR)$(LIBDIR)
for aLib in $(AIS_LIBS); do \
( cd $(builddir) ; \
ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so; \
ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so.2; \
$(CP) -a $(builddir)lib/lib$$aLib.so $(DESTDIR)$(LIBDIR); \
$(CP) -a $(builddir)lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR); \
$(CP) -a lib/lib$$aLib.so $(DESTDIR)$(LIBDIR); \
$(CP) -a lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR); \
install -m 755 lib/lib$$aLib.so.2.* $(DESTDIR)$(LIBDIR); \
if [ "xYES" = "x$(STATICLIBS)" ]; then \
install -m 755 $(builddir)lib/lib$$aLib.a $(DESTDIR)$(LIBDIR); \
install -m 755 lib/lib$$aLib.a $(DESTDIR)$(LIBDIR); \
if [ ${OPENAIS_COMPAT} = "DARWIN" ]; then \
ranlib $(DESTDIR)$(LIBDIR)/lib$$aLib.a; \
fi \
fi \
) \
done
echo $(LIBDIR) > "$(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais-$(ARCH).conf"

View File

@ -76,10 +76,10 @@ libtest_b.o: libtest_b.c
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $<
lcr_ifact.o: lcr_ifact.c
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $(*F).c
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $<
test.o: test.c
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $(*F).c
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $<
clean:
rm -f test libtest.so* *.o uic liblcr.so* liblcr.a *.lcrso *.da *.ba *.bb *.bbg \