diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-13 02:50:27 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-13 02:50:27 +0000 |
| commit | 883f9891cb203dd087843b830ab058d6c9e160dc (patch) | |
| tree | b1aec97f592e2ee8e2bd4c25a0123cf5ab95780b /src/glx/x11 | |
| parent | d9eff8ba1943fbffb88562d84ba1fd9a56be07f0 (diff) | |
LIB_DIR is now just 'lib' or 'lib64'
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
Diffstat (limited to 'src/glx/x11')
| -rw-r--r-- | src/glx/x11/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index b33a84e94b..3ecb744179 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -2,7 +2,7 @@ TOP = ../../.. include $(TOP)/configs/current EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER \ - -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_INSTALL_DIR)\" + -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" SOURCES = \ glcontextmodes.c \ @@ -61,16 +61,16 @@ INCLUDES = -I. \ ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GL_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) glcontextmodes.c: ln -s $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c . # Make libGL -$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ - -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) + -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile @@ -88,7 +88,7 @@ install: # Remove .o and backup files clean: - -rm -f $(LIB_DIR)/libGL.so* + -rm -f $(TOP)/$(LIB_DIR)/libGL.so* -rm -f *.o *~ -rm -f depend |