fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 06:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go into lib64/.

Browse source 
Probably need to fix the install destinations too...
This commit is contained in:
Brian Paul 2006-06-26 15:34:21 +00:00
parent 0deb088cf0
commit 78a6000cf2
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/glu/Makefile
View file

@ -15,7 +15,7 @@ default: $(TOP)/configs/current
install:
$(INSTALL) -d $(INSTALL_DIR)/lib
$(COPY_LIBS) $(TOP)/lib/libGLU.* $(INSTALL_DIR)/lib
$(COPY_LIBS) $(LIB_DIR)/libGLU.* $(INSTALL_DIR)/lib
clean:
@for dir in $(SUBDIRS) ; do \

2
src/glut/glx/Makefile
View file

@ -100,7 +100,7 @@ install:
$(INSTALL) -d $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(INSTALL_DIR)/lib
$(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL
$(COPY_LIBS) $(TOP)/lib/libglut* $(INSTALL_DIR)/lib
$(COPY_LIBS) $(LIB_DIR)/libglut* $(INSTALL_DIR)/lib
clean:

2
src/glw/Makefile
View file

@ -29,7 +29,7 @@ install:
$(INSTALL) -d $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(INSTALL_DIR)/lib
$(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL
$(COPY_LIBS) $(TOP)/lib/libGLw.* $(INSTALL_DIR)/lib
$(COPY_LIBS) $(LIB_DIR)/libGLw.* $(INSTALL_DIR)/lib
clean:
-rm depend depend.bak

2
src/mesa/Makefile
View file

@ -152,7 +152,7 @@ install: default
$(INSTALL) -d $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(INSTALL_DIR)/lib
$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
$(COPY_LIBS) $(TOP)/lib/libGL.* $(INSTALL_DIR)/lib
$(COPY_LIBS) $(LIB_DIR)/libGL.* $(INSTALL_DIR)/lib
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
cd drivers/dri ; $(MAKE) install ; \
fi

2
src/mesa/drivers/directfb/Makefile
View file

@ -34,7 +34,7 @@ default: directfbgl_mesa
# Mesa DirectFBGL module
directfbgl_mesa: $(DIRECTFBGL_MESA_OBJECTS)
$(CC) -shared $(CFLAGS) $(DIRECTFBGL_MESA_OBJECTS) -o $(DIRECTFBGL_MESA) \
-Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(TOP)/lib -lGL -lm
-Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(LIB_DIR) -lGL -lm
install:

2
src/mesa/drivers/dri/Makefile.template
View file

@ -76,7 +76,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/driver
$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
install $(LIBNAME) $(LIB_DIR)
$(INSTALL) $(LIBNAME) $(LIB_DIR)