Mercurial > mxe-octave

diff src/glew.mk @ 3014:b6c7244a2f66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
author John W. Eaton <jwe@octave.org>
date Sun, 02 Jun 2013 16:59:24 -0400
parents 100e618349f7
children 951da75fd09c
line wrap: on
line diff
--- a/src/glew.mk	Sun Jun 02 12:40:32 2013 -0400
+++ b/src/glew.mk	Sun Jun 02 16:59:24 2013 -0400
@@ -22,9 +22,9 @@
     $(TARGET)-ranlib '$(1)/libGLEW.a'
     $(SED) \
         -e "s|@prefix@|$(HOST_PREFIX)|g" \
-        -e "s|@libdir@|$(HOST_PREFIX)/lib|g" \
-        -e "s|@exec_prefix@|$(HOST_PREFIX)/bin|g" \
-        -e "s|@includedir@|$(HOST_PREFIX)/include/GL|g" \
+        -e "s|@libdir@|$(HOST_LIBDIR)|g" \
+        -e "s|@exec_prefix@|$(HOST_BINDIR)|g" \
+        -e "s|@includedir@|$(HOST_INCDIR)/GL|g" \
         -e "s|@version@|$(glew_VERSION)|g" \
         -e "s|@cflags@|-DGLEW_STATIC|g" \
         -e "s|-l@libname@|-lGLEW -lopengl32|g" \
@@ -36,33 +36,33 @@
     $(TARGET)-ranlib '$(1)/libGLEWmx.a'
     $(SED) \
         -e "s|@prefix@|$(HOST_PREFIX)|g" \
-        -e "s|@libdir@|$(HOST_PREFIX)/lib|g" \
-        -e "s|@exec_prefix@|$(HOST_PREFIX)/bin|g" \
-        -e "s|@includedir@|$(HOST_PREFIX)/include/GL|g" \
+        -e "s|@libdir@|$(HOST_LIBDIR)|g" \
+        -e "s|@exec_prefix@|$(HOST_BINDIR)|g" \
+        -e "s|@includedir@|$(HOST_INCDIR)/GL|g" \
         -e "s|@version@|$(glew_VERSION)|g" \
         -e "s|@cflags@|-DGLEW_STATIC -DGLEW_MX|g" \
         -e "s|-l@libname@|-lGLEWmx -lopengl32|g" \
         < '$(1)'/glew.pc.in > '$(1)'/glewmx.pc
 
     # Install
-    $(INSTALL) -d '$(HOST_PREFIX)/lib'
-    $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_PREFIX)/lib/'
-    $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_PREFIX)/lib/libglew32s.a'
-    $(INSTALL) -m644 '$(1)/libGLEWmx.a' '$(HOST_PREFIX)/lib/'
-    $(INSTALL) -d '$(HOST_PREFIX)/lib/pkgconfig'
-    $(INSTALL) -m644 '$(1)/glew.pc' '$(HOST_PREFIX)/lib/pkgconfig/'
-    $(INSTALL) -m644 '$(1)/glewmx.pc' '$(HOST_PREFIX)/lib/pkgconfig/'
-    $(INSTALL) -d '$(HOST_PREFIX)/include'
-    $(INSTALL) -d '$(HOST_PREFIX)/include/GL'
-    $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(HOST_PREFIX)/include/GL/'
+    $(INSTALL) -d '$(HOST_LIBDIR)'
+    $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_LIBDIR)'
+    $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_LIBDIR)/libglew32s.a'
+    $(INSTALL) -m644 '$(1)/libGLEWmx.a' '$(HOST_LIBDIR)'
+    $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig'
+    $(INSTALL) -m644 '$(1)/glew.pc' '$(HOST_LIBDIR)/pkgconfig/'
+    $(INSTALL) -m644 '$(1)/glewmx.pc' '$(HOST_LIBDIR)/pkgconfig/'
+    $(INSTALL) -d '$(HOST_INCDIR)'
+    $(INSTALL) -d '$(HOST_INCDIR)/GL'
+    $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(HOST_INCDIR)/GL/'
 
     # Test
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_PREFIX)/bin/test-glew.exe' \
+        '$(2).c' -o '$(HOST_BINDIR)/test-glew.exe' \
         `'$(TARGET)-pkg-config' glew --cflags --libs`
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_PREFIX)/bin/test-glewmx.exe' \
+        '$(2).c' -o '$(HOST_BINDIR)/test-glewmx.exe' \
         `'$(TARGET)-pkg-config' glewmx --cflags --libs`
 endef