From b7f7ac7f1aa89d2e6af50f1a4fb3387e76d4905e Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Mon, 28 Sep 2009 10:07:00 +0000 Subject: [PATCH] Changed the default install directory to /usr/local in Linux makefiles Fixed absolute symbolic links to relative ones in Linux makefiles git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1224 4e206d99-4929-0410-ac5d-dfc041789085 --- CSFML/src/SFML/Audio/Makefile | 2 +- CSFML/src/SFML/Graphics/Makefile | 2 +- CSFML/src/SFML/Makefile | 2 +- CSFML/src/SFML/Network/Makefile | 2 +- CSFML/src/SFML/System/Makefile | 2 +- CSFML/src/SFML/Window/Makefile | 2 +- src/SFML/Audio/Makefile | 2 +- src/SFML/Graphics/Makefile | 2 +- src/SFML/Makefile | 2 +- src/SFML/Network/Makefile | 2 +- src/SFML/System/Makefile | 2 +- src/SFML/Window/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CSFML/src/SFML/Audio/Makefile b/CSFML/src/SFML/Audio/Makefile index 08bfbce9f..5e06b6b7e 100644 --- a/CSFML/src/SFML/Audio/Makefile +++ b/CSFML/src/SFML/Audio/Makefile @@ -20,4 +20,4 @@ mrproper: clean @rm -rf $(LIBNAME) install: - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) + @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) diff --git a/CSFML/src/SFML/Graphics/Makefile b/CSFML/src/SFML/Graphics/Makefile index d5e1c83d8..9e1f5969d 100644 --- a/CSFML/src/SFML/Graphics/Makefile +++ b/CSFML/src/SFML/Graphics/Makefile @@ -20,4 +20,4 @@ mrproper: clean @rm -rf $(LIBNAME) install: - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) + @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) diff --git a/CSFML/src/SFML/Makefile b/CSFML/src/SFML/Makefile index 553e181f0..2f542131a 100644 --- a/CSFML/src/SFML/Makefile +++ b/CSFML/src/SFML/Makefile @@ -7,7 +7,7 @@ export VERSION = 1.6 export CP = cp export LN = ln export LNFLAGS = -s -f -export DESTDIR = /usr +export DESTDIR = /usr/local export DESTLIBDIR = $(DESTDIR)/lib export DESTINCDIR = $(DESTDIR)/include diff --git a/CSFML/src/SFML/Network/Makefile b/CSFML/src/SFML/Network/Makefile index 924907e0e..9b82f85a2 100644 --- a/CSFML/src/SFML/Network/Makefile +++ b/CSFML/src/SFML/Network/Makefile @@ -20,4 +20,4 @@ mrproper: clean @rm -rf $(LIBNAME) install: - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) + @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) diff --git a/CSFML/src/SFML/System/Makefile b/CSFML/src/SFML/System/Makefile index bdf1e4e55..0de6a1534 100644 --- a/CSFML/src/SFML/System/Makefile +++ b/CSFML/src/SFML/System/Makefile @@ -20,4 +20,4 @@ mrproper: clean @rm -rf $(LIBNAME) install: - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) + @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) diff --git a/CSFML/src/SFML/Window/Makefile b/CSFML/src/SFML/Window/Makefile index 3bd276a48..b6f7bcdb5 100644 --- a/CSFML/src/SFML/Window/Makefile +++ b/CSFML/src/SFML/Window/Makefile @@ -20,4 +20,4 @@ mrproper: clean @rm -rf $(LIBNAME) install: - @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) + @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)) diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile index 109a00ad4..0215e809f 100644 --- a/src/SFML/Audio/Makefile +++ b/src/SFML/Audio/Makefile @@ -10,7 +10,7 @@ ifeq ($(STATIC), yes) else LIB = libsfml-audio.so LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) endif all: $(LIB) diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile index c92743560..4de224d63 100644 --- a/src/SFML/Graphics/Makefile +++ b/src/SFML/Graphics/Makefile @@ -18,7 +18,7 @@ ifeq ($(STATIC), yes) else LIB = libsfml-graphics.so LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) endif all: $(LIB) diff --git a/src/SFML/Makefile b/src/SFML/Makefile index 02b70e460..efa9fdb9d 100644 --- a/src/SFML/Makefile +++ b/src/SFML/Makefile @@ -27,7 +27,7 @@ export LN = ln export LNFLAGS = -s -f export AR = ar export ARFLAGS = rcs -export DESTDIR = /usr +export DESTDIR = /usr/local export DESTLIBDIR = $(DESTDIR)/lib export DESTINCDIR = $(DESTDIR)/include diff --git a/src/SFML/Network/Makefile b/src/SFML/Network/Makefile index d30da6248..62fb67312 100644 --- a/src/SFML/Network/Makefile +++ b/src/SFML/Network/Makefile @@ -8,7 +8,7 @@ ifeq ($(STATIC), yes) else LIB = libsfml-network.so LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) endif all: $(LIB) diff --git a/src/SFML/System/Makefile b/src/SFML/System/Makefile index 04514f5bb..1cf6211e8 100644 --- a/src/SFML/System/Makefile +++ b/src/SFML/System/Makefile @@ -8,7 +8,7 @@ ifeq ($(STATIC), yes) else LIB = libsfml-system.so LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) endif all: $(LIB) diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile index 956b34ba2..0dd689c41 100644 --- a/src/SFML/Window/Makefile +++ b/src/SFML/Window/Makefile @@ -9,7 +9,7 @@ ifeq ($(STATIC), yes) else LIB = libsfml-window.so LIBNAME = $(LIBPATH)/$(LIB).$(VERSION) - INSTALL = && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) + INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) endif all: $(LIB)