|
 |
7e470f |
From 094647cb14cf99b776f7c635068a702e4968902a Mon Sep 17 00:00:00 2001
|
|
|
7e470f |
From: hasufell <julian.ospald@googlemail.com>
|
|
|
7e470f |
Date: Wed, 24 Jul 2013 01:41:27 +0200
|
|
|
7e470f |
Subject: [PATCH] BUILD: respect DESTDIR variable
|
|
|
7e470f |
|
|
|
7e470f |
DESTDIR is used for temporary install location
|
|
|
7e470f |
in package managers otherwise you have to add
|
|
|
7e470f |
the temporary locations to BINDIR and LIBDIR
|
|
|
7e470f |
which can cause trouble with the pkg-config file.
|
|
|
7e470f |
---
|
|
|
7e470f |
Makefile | 74 ++++++++++++++++++++++++++++++++--------------------------------
|
|
|
7e470f |
1 file changed, 37 insertions(+), 37 deletions(-)
|
|
|
7e470f |
|
|
|
7e470f |
diff --git a/Makefile b/Makefile
|
|
|
7e470f |
index e6f08a7..9fdac23 100644
|
|
|
7e470f |
--- a/Makefile
|
|
|
7e470f |
+++ b/Makefile
|
|
|
7e470f |
@@ -231,81 +231,81 @@ install: install.include install.lib install.pkgconfig
|
|
|
7e470f |
install.mx: install.include install.lib.mx install.pkgconfig.mx
|
|
|
7e470f |
|
|
|
7e470f |
install.lib: glew.lib
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(LIBDIR)
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)"
|
|
|
7e470f |
# runtime
|
|
|
7e470f |
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(BINDIR)
|
|
|
7e470f |
- $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)"
|
|
|
7e470f |
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) "$(DESTDIR)$(BINDIR)/"
|
|
|
7e470f |
else
|
|
|
7e470f |
- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
|
|
|
7e470f |
+ $(INSTALL) -m 0644 lib/$(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/"
|
|
|
7e470f |
endif
|
|
|
7e470f |
ifneq ($(LN),)
|
|
|
7e470f |
- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
|
|
|
7e470f |
+ $(LN) $(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)"
|
|
|
7e470f |
endif
|
|
|
7e470f |
|
|
|
7e470f |
# development files
|
|
|
7e470f |
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
|
|
7e470f |
- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
|
|
|
7e470f |
+ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) "$(DESTDIR)$(LIBDIR)/"
|
|
|
7e470f |
endif
|
|
|
7e470f |
ifneq ($(LN),)
|
|
|
7e470f |
- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
|
|
|
7e470f |
+ $(LN) $(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)"
|
|
|
7e470f |
endif
|
|
|
7e470f |
- $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
|
|
|
7e470f |
+ $(INSTALL) -m 0644 lib/$(LIB.STATIC) "$(DESTDIR)$(LIBDIR)/"
|
|
|
7e470f |
|
|
|
7e470f |
install.lib.mx: glew.lib.mx
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(LIBDIR)
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)"
|
|
|
7e470f |
# runtime
|
|
|
7e470f |
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(BINDIR)
|
|
|
7e470f |
- $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)"
|
|
|
7e470f |
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(BINDIR)/"
|
|
|
7e470f |
else
|
|
|
7e470f |
- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
|
|
|
7e470f |
+ $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/"
|
|
|
7e470f |
endif
|
|
|
7e470f |
ifneq ($(LN),)
|
|
|
7e470f |
- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)
|
|
|
7e470f |
+ $(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)"
|
|
|
7e470f |
endif
|
|
|
7e470f |
# development files
|
|
|
7e470f |
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
|
|
7e470f |
- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/
|
|
|
7e470f |
+ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) "$(DESTDIR)$(LIBDIR)/"
|
|
|
7e470f |
endif
|
|
|
7e470f |
ifneq ($(LN),)
|
|
|
7e470f |
- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX)
|
|
|
7e470f |
+ $(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX)"
|
|
|
7e470f |
endif
|
|
|
7e470f |
- $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/
|
|
|
7e470f |
+ $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) "$(DESTDIR)$(LIBDIR)/"
|
|
|
7e470f |
|
|
|
7e470f |
install.bin: glew.bin
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(BINDIR)
|
|
|
7e470f |
- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)"
|
|
|
7e470f |
+ $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/"
|
|
|
7e470f |
|
|
|
7e470f |
install.include:
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(INCDIR)
|
|
|
7e470f |
- $(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/
|
|
|
7e470f |
- $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/
|
|
|
7e470f |
- $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(INCDIR)"
|
|
|
7e470f |
+ $(INSTALL) -m 0644 include/GL/wglew.h "$(DESTDIR)$(INCDIR)/"
|
|
|
7e470f |
+ $(INSTALL) -m 0644 include/GL/glew.h "$(DESTDIR)$(INCDIR)/"
|
|
|
7e470f |
+ $(INSTALL) -m 0644 include/GL/glxew.h "$(DESTDIR)$(INCDIR)/"
|
|
|
7e470f |
|
|
|
7e470f |
install.pkgconfig: glew.pc
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(LIBDIR)
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig
|
|
|
7e470f |
- $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)"
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)/pkgconfig"
|
|
|
7e470f |
+ $(INSTALL) -m 0644 glew.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/"
|
|
|
7e470f |
|
|
|
7e470f |
install.pkgconfig.mx: glewmx.pc
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(LIBDIR)
|
|
|
7e470f |
- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig
|
|
|
7e470f |
- $(INSTALL) -m 0644 glewmx.pc $(LIBDIR)/pkgconfig/
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)"
|
|
|
7e470f |
+ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)/pkgconfig"
|
|
|
7e470f |
+ $(INSTALL) -m 0644 glewmx.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/"
|
|
|
7e470f |
|
|
|
7e470f |
uninstall:
|
|
|
7e470f |
- $(RM) $(INCDIR)/wglew.h
|
|
|
7e470f |
- $(RM) $(INCDIR)/glew.h
|
|
|
7e470f |
- $(RM) $(INCDIR)/glxew.h
|
|
|
7e470f |
- $(RM) $(LIBDIR)/$(LIB.DEVLNK) $(LIBDIR)/$(LIB.DEVLNK.MX)
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(INCDIR)/wglew.h"
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(INCDIR)/glew.h"
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(INCDIR)/glxew.h"
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)" "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX)"
|
|
|
7e470f |
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
|
|
7e470f |
- $(RM) $(BINDIR)/$(LIB.SHARED) $(BINDIR)/$(LIB.SHARED.MX)
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(BINDIR)/$(LIB.SHARED)" "$(DESTDIR)$(BINDIR)/$(LIB.SHARED.MX)"
|
|
|
7e470f |
else
|
|
|
7e470f |
- $(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX)
|
|
|
7e470f |
- $(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX)
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)" "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)"
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SHARED)" "$(DESTDIR)$(LIBDIR)/$(LIB.SHARED.MX)"
|
|
|
7e470f |
endif
|
|
|
7e470f |
- $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX)
|
|
|
7e470f |
- $(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN)
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.STATIC)" "$(DESTDIR)$(LIBDIR)/$(LIB.STATIC.MX)"
|
|
|
7e470f |
+ $(RM) "$(DESTDIR)$(BINDIR)/$(GLEWINFO.BIN)" "$(DESTDIR)$(BINDIR)/$(VISUALINFO.BIN)"
|
|
|
7e470f |
|
|
|
7e470f |
clean:
|
|
|
7e470f |
$(RM) -r tmp/
|
|
|
7e470f |
--
|
|
|
7e470f |
1.8.4.2
|
|
|
7e470f |
|