$OpenBSD$ --- src/SFML/Graphics/Makefile.orig Wed Jan 27 17:00:05 2010 +++ src/SFML/Graphics/Makefile Thu Oct 27 19:06:35 2011 @@ -17,7 +17,7 @@ ifeq ($(STATIC), yes) INSTALL = else LIB = libsfml-graphics.so - LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) + LIBNAME = $(LIBPATH)/$(LIB).${LIBsfml-graphics_VERSION} INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) endif @@ -27,13 +27,13 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(O $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) - $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL + $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).${LIBsfml-graphics_VERSION} -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL $(OBJ): %.o: %.cpp - $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 + $(CXX) -o $@ -c $< $(CXXFLAGS) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c - $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG + $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG .PHONY: clean mrproper @@ -44,4 +44,4 @@ mrproper: clean @rm -rf $(LIBNAME) install: - @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL)) + $(BSD_INSTALL_DATA) $(LIBNAME) $(DESTLIBDIR)