diff options
| author | Brian Paul <[email protected]> | 2006-07-13 02:50:27 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-07-13 02:50:27 +0000 |
| commit | 883f9891cb203dd087843b830ab058d6c9e160dc (patch) | |
| tree | b1aec97f592e2ee8e2bd4c25a0123cf5ab95780b /src/glx/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/glx/mini')
| -rw-r--r-- | src/glx/mini/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile index 9503192274c..217b8a76ec5 100644 --- a/src/glx/mini/Makefile +++ b/src/glx/mini/Makefile @@ -46,16 +46,16 @@ INCLUDE_DIRS = \ ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GL_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Make libGL -$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ - -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) `/usr/bin/pkg-config --libs libdrm` `/usr/bin/pkg-config --libs pciaccess` - rm -f $(LIB_DIR)/miniglx.conf - install example.miniglx.conf $(LIB_DIR)/miniglx.conf + -install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) `/usr/bin/pkg-config --libs libdrm` `/usr/bin/pkg-config --libs pciaccess` + rm -f $(TOP)/$(LIB_DIR)/miniglx.conf + install example.miniglx.conf $(TOP)/$(LIB_DIR)/miniglx.conf drmtest: xf86drm.o drmtest.o @@ -75,7 +75,7 @@ tags: # Remove .o and backup files clean: - -rm -f drmtest $(LIB_DIR)/libGL.so* + -rm -f drmtest $(TOP)/$(LIB_DIR)/libGL.so* -rm -f *.o *~ -rm -f depend |