merged.
thanks
On Fri, 2007-09-28 at 22:44 +1200, Angus Salkeld wrote:
> Hi
>
> This should sort out the "make install" for:
>
> 1)
> make
> make DESTDIR=/usr install
>
> 2)
> make O=/tmp/ais-objects
> make O=/tmp/ais-objects DESTDIR=/usr install
>
> The patch is inline and attached.
>
> -Angus
>
> Makefile | 8 +++++---
> lcr/Makefile | 4 ++--
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 3e208bb..3be5ea3 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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
> diff --git a/lcr/Makefile b/lcr/Makefile
> index 2f4ba40..4244df9 100644
> --- a/lcr/Makefile
> +++ b/lcr/Makefile
> @@ -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 \
> _______________________________________________
> Openais mailing list
> [email protected]
> https://lists.linux-foundation.org/mailman/listinfo/openais
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
