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/glu | |
| 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/glu')
| -rw-r--r-- | src/glu/Makefile | 4 | ||||
| -rw-r--r-- | src/glu/mesa/Makefile | 10 | ||||
| -rw-r--r-- | src/glu/sgi/Makefile | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/glu/Makefile b/src/glu/Makefile index a7b8e2b724..ca9ad39442 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 69a4ea88cf..47f95ef024 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 46dafe999e..2ce6ac0430 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) |