From 883f9891cb203dd087843b830ab058d6c9e160dc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 13 Jul 2006 02:50:27 +0000 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mesa/drivers/beos/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/beos') diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile index 41aa3a65c1..1897d6aa3e 100644 --- a/src/mesa/drivers/beos/Makefile +++ b/src/mesa/drivers/beos/Makefile @@ -167,7 +167,7 @@ OBJECTS := $(DRIVER_OBJECTS:.cpp=.o) $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ -default: depend $(LIB_DIR) $(LIB_DIR)/$(GL_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(MESA_MODULES): cd $(TOP)/src/mesa; $(MAKE) mesa.a ; @@ -175,11 +175,11 @@ $(MESA_MODULES): $(GLU_MODULES): cd $(GLU_DIR); $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ; -$(LIB_DIR): - mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + mkdir $(TOP)/$(LIB_DIR) -$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) - @$(TOP)/bin/mklib -o $(GL_LIB) -install $(LIB_DIR) -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) + @$(TOP)/bin/mklib -o $(GL_LIB) -install $(TOP)/$(LIB_DIR) -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) # $(GLU_OBJECTS): -- cgit v1.2.3