diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-10-19 20:09:05 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-10-19 20:09:05 +0000 |
commit | 464fcd0dd84cf4c705b992a087cdcb8b403eb8ef (patch) | |
tree | 79b8da581c361c33fd40bc4ca4605482a8b1b760 /configs | |
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 'configs')
-rw-r--r-- | configs/aix | 1 | ||||
-rw-r--r-- | configs/default | 6 | ||||
-rw-r--r-- | configs/freebsd | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/configs/aix b/configs/aix index 313d4c4fdb..ebbf583745 100644 --- a/configs/aix +++ b/configs/aix @@ -13,7 +13,6 @@ CXXFLAGS = -O -DAIXV3 -DPTHREADS # Misc tools and flags MKLIB_OPTIONS = -COPY_LIBS = cp -f -h # Library names (actual file names) GL_LIB_NAME = libGL.a diff --git a/configs/default b/configs/default index 8431fff0b8..aa6cef9e3c 100644 --- a/configs/default +++ b/configs/default @@ -27,8 +27,7 @@ MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make -INSTALL = install -COPY_LIBS = cp -f -d +INSTALL = $(TOP)/bin/minstall # Python and flags (generally only needed by the developers) PYTHON2 = python @@ -79,7 +78,8 @@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm # Installation directories (for make install) -INSTALL_DIR = /usr/local +#INSTALL_DIR = /usr/local +INSTALL_DIR = /tmp/mesa2 DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri # Where libGL will look for DRI hardware drivers diff --git a/configs/freebsd b/configs/freebsd index 38806ab946..db7dd3b78a 100644 --- a/configs/freebsd +++ b/configs/freebsd @@ -9,9 +9,6 @@ CC = cc CXX = c++ MAKE = gmake -# cp -d not supported on FreeBSD (see bug 4435) -COPY_LIBS = cp -f - OPT_FLAGS = -O2 PIC_FLAGS = -fPIC |