$NetBSD: patch-aa,v 1.10 2008/04/28 09:48:13 wiz Exp $ --- make/linux/Makefile.orig 2006-06-02 16:32:15.000000000 +0200 +++ make/linux/Makefile @@ -16,15 +16,15 @@ prefix=/boot/home/config else prefix=/usr/local endif -libdir=$(prefix)/lib -includedir=$(prefix)/include/ebml +libdir=$(DESTDIR)$(PREFIX)/lib +includedir=$(DESTDIR)$(PREFIX)/include/ebml # Programs -CXX=g++ +#CXX=g++ LD=$(CXX) -AR = ar rcvu -RANLIB = ranlib -INSTALL = install +AR += rcvu +#RANLIB = ranlib +INSTALL = $(BSD_INSTALL) INSTALL_OPTS = -m 644 INSTALL_OPTS_LIB = -m 644 INSTALL_DIR_OPTS = -m 755 @@ -51,7 +51,7 @@ LIBS= # Names LIBRARY=libebml.a -LIBRARY_SO=libebml.so +LIBRARY_SO=libebml.la LIBRARY_SO_VER=libebml.so.0 # source-files @@ -87,16 +87,14 @@ lib: $(CXX) -c $(COMPILEFLAGS) -o $@ $< %.lo: %$(EXTENSION) - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< + $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $< $(LIBRARY): $(objects) $(AR) $@ $(objects) $(RANLIB) $@ $(LIBRARY_SO): $(objects_so) - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) - rm -f $(LIBRARY_SO) - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + $(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -rpath $(PREFIX)/lib -version-info 0 clean: rm -f $(objects) $(objects_so) @@ -140,8 +138,7 @@ install_staticlib: $(LIBRARY) install_sharedlib: $(LIBRARY_SO) $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) - ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) + $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(libdir) ifneq ($(wildcard .depend),)