From dea5a6143c362cd77443541bc2014f1b64335768 Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@users.sourceforge.net>
Date: Mon, 25 Apr 2011 21:15:35 -0500
Subject: [PATCH] For ID: 3148451 - bad dll perms on default cygwin 1.7.7
 install

---
 Makefile               | 16 +++++++++-------
 config/Makefile.cygwin | 12 ++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index bb019a5..5637c2b 100644
--- a/Makefile
+++ b/Makefile
@@ -181,8 +181,9 @@ install.lib: glew.lib
 	$(INSTALL) -d -m 0755 $(LIBDIR)
 # runtime
 ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
+	$(INSTALL) -d -m 0755 $(BINDIR)
 	$(STRIP) -x lib/$(LIB.SHARED)
-	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
+	$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
 else
 	$(STRIP) -x lib/$(LIB.SHARED)
 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
@@ -192,17 +193,18 @@ endif
 ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
 else
-	$(STRIP) -x lib/$(LIB.STATIC)
-	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
 endif
+	$(STRIP) -x lib/$(LIB.STATIC)
+	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
 
 install.lib.mx: glew.lib.mx
 	$(INSTALL) -d -m 0755 $(LIBDIR)
 # runtime
 ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
+	$(INSTALL) -d -m 0755 $(BINDIR)
 	$(STRIP) -x lib/$(LIB.SHARED.MX)
-	$(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(BINDIR)/
+	$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
 else
 	$(STRIP) -x lib/$(LIB.SHARED.MX)
 	$(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
@@ -212,10 +214,10 @@ endif
 ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/
 else
-	$(STRIP) -x lib/$(LIB.STATIC.MX)
-	$(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/
 	$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX)
 endif
+	$(STRIP) -x lib/$(LIB.STATIC.MX)
+	$(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/
 
 install.bin: glew.bin
 	$(INSTALL) -d -m 0755 $(BINDIR)
@@ -247,8 +249,8 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
 else
 	$(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX)
 	$(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX)
-	$(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX)
 endif
+	$(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX)
 	$(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN)
 
 clean:
diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin
index 068bc09..8280bf2 100644
--- a/config/Makefile.cygwin
+++ b/config/Makefile.cygwin
@@ -1,9 +1,9 @@
 NAME = GLEW
-GLEW_DEST ?= /usr/X11R6
+GLEW_DEST ?= /usr
 CC = cc
 # use gcc for linking, with ld it does not work
 LD = cc
-LDFLAGS.EXTRA = -L/usr/X11R6/lib
+LDFLAGS.EXTRA =
 LIBDIR = $(GLEW_DEST)/lib
 LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
 LDFLAGS.STATIC = -Wl,-Bstatic
@@ -11,13 +11,13 @@ LDFLAGS.DYNAMIC = -Wl,-Bdynamic
 WARN = -Wall -W
 POPT = -O2
 BIN.SUFFIX = .exe
-LIB.SONAME    = cyg$(NAME)-$(SO_MAJOR).dll
+LIB.SONAME    = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
 LIB.DEVLNK    = lib$(NAME).dll.a
-LIB.SHARED    = cyg$(NAME)-$(SO_MAJOR).dll
+LIB.SHARED    = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
 LIB.STATIC    = lib$(NAME).a
 LDFLAGS.SO    = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK)
-LIB.SONAME.MX = cyg$(NAME)mx-$(SO_MAJOR).dll
+LIB.SONAME.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
 LIB.DEVLNK.MX = lib$(NAME)mx.dll.a
-LIB.SHARED.MX = cyg$(NAME)mx-$(SO_MAJOR).dll
+LIB.SHARED.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
 LIB.STATIC.MX = lib$(NAME)mx.a
 LDFLAGS.SO.MX = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)