Attachment #238979 for bug #258895

Lines 10-16 Link Here

(-)SFML-1.6.orig/src/SFML/Audio/Makefile (-2 / +2 lines)
10	else	10	else
11	LIB = libsfml-audio.so	11	LIB = libsfml-audio.so
12	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)	12	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
13	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)	13	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
14	endif	14	endif
15		15
16	all: $(LIB)	16	all: $(LIB)
Lines 36-39 Link Here
36	@rm -rf $(LIBNAME)	36	@rm -rf $(LIBNAME)
37		37
38	install:	38	install:
39	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))	39	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

Lines 18-24 Link Here

(-)SFML-1.6.orig/src/SFML/Graphics/Makefile (-2 / +2 lines)
18	else	18	else
19	LIB = libsfml-graphics.so	19	LIB = libsfml-graphics.so
20	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)	20	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
21	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)	21	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
22	endif	22	endif
23		23
24	all: $(LIB)	24	all: $(LIB)
Lines 44-47 Link Here
44	@rm -rf $(LIBNAME)	44	@rm -rf $(LIBNAME)
45		45
46	install:	46	install:
47	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))	47	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

Lines 28-35 Link Here

(-)SFML-1.6.orig/src/SFML/Makefile (-5 / +9 lines)
28	export AR = ar	28	export AR = ar
29	export ARFLAGS = rcs	29	export ARFLAGS = rcs
30	export DESTDIR = /usr/local	30	export DESTDIR = /usr/local
31	export DESTLIBDIR = $(DESTDIR)/lib	31
32	export DESTINCDIR = $(DESTDIR)/include	32	ifeq ($(origin prefix), undefined)
		33	export prefix = /usr/local
		34	endif
		35	export libdir = $(prefix)/lib
		36	export includedir = $(prefix)/include
33		37
34	all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio	38	all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
35		39
Lines 62-67 Link Here
62	@(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)	66	@(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
63		67
64	install:	68	install:
65	@(mkdir -p $(DESTLIBDIR))	69	@(mkdir -p $(DESTDIR)/$(libdir))
66	@(mkdir -p $(DESTINCDIR))	70	@(mkdir -p $(DESTDIR)/$(includedir))
67	@(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTINCDIR)/)	71	@(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/$(includedir)/)

Lines 8-14 Link Here

(-)SFML-1.6.orig/src/SFML/Network/Makefile (-2 / +2 lines)
8	else	8	else
9	LIB = libsfml-network.so	9	LIB = libsfml-network.so
10	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)	10	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
11	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)	11	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
12	endif	12	endif
13		13
14	all: $(LIB)	14	all: $(LIB)
Lines 31-34 Link Here
31	@rm -rf $(LIBNAME)	31	@rm -rf $(LIBNAME)
32		32
33	install:	33	install:
34	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))	34	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

Lines 8-14 Link Here

(-)SFML-1.6.orig/src/SFML/System/Makefile (-2 / +2 lines)
8	else	8	else
9	LIB = libsfml-system.so	9	LIB = libsfml-system.so
10	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)	10	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
11	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)	11	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
12	endif	12	endif
13		13
14	all: $(LIB)	14	all: $(LIB)
Lines 31-34 Link Here
31	@rm -rf $(LIBNAME)	31	@rm -rf $(LIBNAME)
32		32
33	install:	33	install:
34	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))	34	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

Lines 9-15 Link Here

(-)SFML-1.6.orig/src/SFML/Window/Makefile (-2 / +2 lines)
9	else	9	else
10	LIB = libsfml-window.so	10	LIB = libsfml-window.so
11	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)	11	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
12	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)	12	INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTDIR)/$(libdir)/$(LIB)
13	endif	13	endif
14		14
15	all: $(LIB)	15	all: $(LIB)
Lines 32-35 Link Here
32	@rm -rf $(LIBNAME)	32	@rm -rf $(LIBNAME)
33		33
34	install:	34	install:
35	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))	35	@($(CP) $(LIBNAME) $(DESTDIR)/$(libdir) $(INSTALL))

Return to bug 258895