summaryrefslogtreecommitdiff
path: root/src/glw/Makefile
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-07-13 02:50:27 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-07-13 02:50:27 +0000
commit883f9891cb203dd087843b830ab058d6c9e160dc (patch)
treeb1aec97f592e2ee8e2bd4c25a0123cf5ab95780b /src/glw/Makefile
parentd9eff8ba1943fbffb88562d84ba1fd9a56be07f0 (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/glw/Makefile')
-rw-r--r--src/glw/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/glw/Makefile b/src/glw/Makefile
index dbe64c9566..356351a1ce 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -23,13 +23,13 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
##### TARGETS #####
-default: $(LIB_DIR)/$(GLW_LIB_NAME)
+default: $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME)
install:
$(INSTALL) -d $(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(INSTALL_DIR)/lib
+ $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
$(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL
- $(COPY_LIBS) $(LIB_DIR)/libGLw.* $(INSTALL_DIR)/lib
+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLw.* $(INSTALL_DIR)/$(LIB_DIR)
clean:
-rm depend depend.bak
@@ -37,10 +37,10 @@ clean:
# Make the library
-$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
+$(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
$(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \
-major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
- $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+ $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
$(GLW_LIB_DEPS) $(OBJECTS)