diff options
| author | Brian Paul <[email protected]> | 2006-10-19 20:09:05 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-10-19 20:09:05 +0000 |
| commit | 464fcd0dd84cf4c705b992a087cdcb8b403eb8ef (patch) | |
| tree | 79b8da581c361c33fd40bc4ca4605482a8b1b760 /src | |
| parent | c351858de8e51fa4a6425cf176cc43689189f3ff (diff) | |
New bin/minstall script - a minimal replacement for 'install'.
Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/glu/Makefile | 2 | ||||
| -rw-r--r-- | src/glut/fbdev/Makefile | 2 | ||||
| -rw-r--r-- | src/glut/glx/Makefile | 2 | ||||
| -rw-r--r-- | src/glw/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/glu/Makefile b/src/glu/Makefile index ca9ad39442c..5ddc50946aa 100644 --- a/src/glu/Makefile +++ b/src/glu/Makefile @@ -15,7 +15,7 @@ default: $(TOP)/configs/current install: $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) - $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLU.* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) $(TOP)/$(LIB_DIR)/libGLU.* $(INSTALL_DIR)/$(LIB_DIR) clean: @for dir in $(SUBDIRS) ; do \ diff --git a/src/glut/fbdev/Makefile b/src/glut/fbdev/Makefile index 11d95665adb..254ff8c098f 100644 --- a/src/glut/fbdev/Makefile +++ b/src/glut/fbdev/Makefile @@ -72,7 +72,7 @@ install: $(INSTALL) -d $(INSTALL_DIR)/include/GL $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL - $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) # Run 'make -f Makefile.solo dep' to update the dependencies if you change # what's included by any source file. diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile index 6fac92fa0cb..7e1d56b3278 100644 --- a/src/glut/glx/Makefile +++ b/src/glut/glx/Makefile @@ -100,7 +100,7 @@ install: $(INSTALL) -d $(INSTALL_DIR)/include/GL $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL - $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) clean: diff --git a/src/glw/Makefile b/src/glw/Makefile index 356351a1ced..5228cbbb721 100644 --- a/src/glw/Makefile +++ b/src/glw/Makefile @@ -29,7 +29,7 @@ install: $(INSTALL) -d $(INSTALL_DIR)/include/GL $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL - $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGLw.* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(INSTALL_DIR)/$(LIB_DIR) clean: -rm depend depend.bak diff --git a/src/mesa/Makefile b/src/mesa/Makefile index e1046bb8ad7..3f65ecf5cc9 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -155,10 +155,10 @@ install: default $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \ - $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \ + $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \ fi @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \ - $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \ + $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \ fi @if [ "${DRIVER_DIRS}" = "dri" ] ; then \ cd drivers/dri ; $(MAKE) install ; \ |