49 lines
1.3 KiB
Plaintext
49 lines
1.3 KiB
Plaintext
$OpenBSD: patch-make_linux_Makefile,v 1.4 2007/01/04 20:56:43 steven Exp $
|
|
--- make/linux/Makefile.orig Thu Mar 30 21:05:11 2006
|
|
+++ make/linux/Makefile Thu Jan 4 21:58:05 2007
|
|
@@ -16,11 +16,11 @@ prefix=/boot/home/config
|
|
else
|
|
prefix=/usr/local
|
|
endif
|
|
-libdir=$(prefix)/lib
|
|
-includedir=$(prefix)/include/ebml
|
|
+libdir=$(PREFIX)/lib
|
|
+includedir=$(PREFIX)/include/ebml
|
|
|
|
# Programs
|
|
-CXX=g++
|
|
+#CXX=g++
|
|
LD=$(CXX)
|
|
AR = ar rcvu
|
|
RANLIB = ranlib
|
|
@@ -51,8 +51,8 @@ LIBS=
|
|
|
|
# Names
|
|
LIBRARY=libebml.a
|
|
-LIBRARY_SO=libebml.so
|
|
-LIBRARY_SO_VER=libebml.so.0
|
|
+LIBRARY_SO_VER=libebml.so.${LIBebml_VERSION}
|
|
+LIBRARY_SO=${LIBRARY_SO_VER}
|
|
|
|
# source-files
|
|
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
|
|
@@ -94,9 +94,7 @@ $(LIBRARY): $(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)
|
|
+ $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -fPIC
|
|
|
|
clean:
|
|
rm -f $(objects) $(objects_so)
|
|
@@ -141,7 +139,6 @@ install_staticlib: $(LIBRARY)
|
|
install_sharedlib: $(LIBRARY_SO)
|
|
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
|
|
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
|
|
- ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
|
|
|
|
|
|
ifneq ($(wildcard .depend),)
|