diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2008-07-11 13:54:48 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2008-07-12 10:25:40 -0700 |
| commit | db072baaaf6adcd176ea7e4d67b77177de7eca31 (patch) | |
| tree | 03d44046fa8e50f0bbd23bd283dd3d6a7b480d91 /src/glx | |
| parent | 4f5d97ee9eae6f2adf27e2297f955b601483d61b (diff) | |
| download | mesa-db072baaaf6adcd176ea7e4d67b77177de7eca31.tar.gz | |
Call mklib with $(SHELL) so the user controls the interpreter
Respect the user's choice of shell when running mklib rather than always
using /bin/sh.
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/mini/Makefile | 2 | ||||
| -rw-r--r-- | src/glx/x11/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile index 69c3d683e8c..aabc1d2be30 100644 --- a/src/glx/mini/Makefile +++ b/src/glx/mini/Makefile @@ -49,7 +49,7 @@ default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/miniglx.conf # Make libGL $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile - @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ + @ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) \ $(LIBDRM_LIB) $(PCIACCESS_LIB) diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index c45c7de6d6d..121f3dfac00 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -71,7 +71,7 @@ default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Make libGL $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile - $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ + $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) |