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/glut/mini | |
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/glut/mini')
-rw-r--r-- | src/glut/mini/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile index cb82384941..177bfe2d2b 100644 --- a/src/glut/mini/Makefile +++ b/src/glut/mini/Makefile @@ -50,14 +50,14 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GLUT_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - $(GLUT_LIB_DEPS) -install $(LIB_DIR) \ + $(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(OBJECTS) |