From 883f9891cb203dd087843b830ab058d6c9e160dc Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 13 Jul 2006 02:50:27 +0000
Subject: =?UTF-8?q?LIB=5FDIR=20is=20now=20just=20'lib'=20or=20'lib64'=20Re?=
 =?UTF-8?q?placed=20$(LIB=5FDIR)=20with=20$(TOP)/$(LIB=5FDIR),=20use=20LIB?=
 =?UTF-8?q?=5FDIR=20in=20install=20targets.=20Patch=20by=20Hanno=20B=C3=83?=
 =?UTF-8?q?=C2=B6ck.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glu/Makefile      |  4 ++--
 src/glu/mesa/Makefile | 10 +++++-----
 src/glu/sgi/Makefile  | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/glu')

diff --git a/src/glu/Makefile b/src/glu/Makefile
index a7b8e2b..ca9ad39 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -14,8 +14,8 @@ default: $(TOP)/configs/current
 	done
 
 install:
-	$(INSTALL) -d $(INSTALL_DIR)/lib
-	$(COPY_LIBS) $(LIB_DIR)/libGLU.* $(INSTALL_DIR)/lib
+	$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
+	$(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLU.* $(INSTALL_DIR)/$(LIB_DIR)
 
 clean:
 	@for dir in $(SUBDIRS) ; do \
diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index 69a4ea8..47f95ef 100644
--- a/src/glu/mesa/Makefile
+++ b/src/glu/mesa/Makefile
@@ -37,17 +37,17 @@ default:
 		echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \
 		exit 0 ; \
 	else \
-		$(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \
+		$(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \
 	fi
 
-$(LIB_DIR):
-	-mkdir $(LIB_DIR)
+$(TOP)/$(LIB_DIR):
+	-mkdir $(TOP)/$(LIB_DIR)
 
 # Make the library:
-$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
 	@ $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CC)' \
 		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
-		$(MKLIB_OPTIONS) -install $(LIB_DIR) \
+		$(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
 		$(GLU_LIB_DEPS) $(OBJECTS)
 
 clean:
diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile
index 46dafe9..2ce6ac0 100644
--- a/src/glu/sgi/Makefile
+++ b/src/glu/sgi/Makefile
@@ -128,17 +128,17 @@ default:
 		echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \
 		exit 0 ; \
 	else \
-		$(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \
+		$(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \
 	fi
 
-$(LIB_DIR):
-	-mkdir $(LIB_DIR)
+$(TOP)/$(LIB_DIR):
+	-mkdir $(TOP)/$(LIB_DIR)
 
 # Make the library:
-$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
 	$(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
 		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
-		-cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+		-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
 		$(GLU_LIB_DEPS) $(OBJECTS)
 
 
-- 
cgit v1.1