diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-07-13 19:20:03 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-07-13 19:20:03 +0200 |
| commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
| tree | dee99970e9d1e6d892f21db31488470bc7929d18 /configs | |
| parent | dabd09f5a92e5497ac6ac9b4ba26f806ddb25206 (diff) | |
| parent | 4fab47b13c214dc79e0ae5d8001521029ce34231 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 8 | ||||
| -rw-r--r-- | configs/default | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index ed44a0f1a68..8ed1c93d11a 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -27,10 +27,10 @@ ASM_API = @ASM_API@ # Misc tools and flags MAKE = @MAKE@ +SHELL = @SHELL@ MKLIB_OPTIONS = @MKLIB_OPTIONS@ MKDEP = @MKDEP@ MKDEP_OPTIONS = @MKDEP_OPTIONS@ -INSTALL = $(TOP)/bin/minstall # Python and flags (generally only needed by the developers) PYTHON2 = python @@ -89,15 +89,15 @@ EXPAT_INCLUDES = @EXPAT_INCLUDES@ prefix = @prefix@ exec_prefix = @exec_prefix@ libdir = @libdir@ +includedir = @includedir@ # Installation directories (for make install) INSTALL_DIR = $(prefix) +INSTALL_LIB_DIR = $(libdir) +INSTALL_INC_DIR = $(includedir) # DRI installation directories DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) - -# Additional per-platform configuration settings -@EXTRA_CONFIG_LINES@ diff --git a/configs/default b/configs/default index 37b693932d6..a14078fa269 100644 --- a/configs/default +++ b/configs/default @@ -25,11 +25,13 @@ LDFLAGS = GLU_CFLAGS = # Misc tools and flags +SHELL = /bin/sh +MKLIB = $(SHELL) $(TOP)/bin/mklib MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make -INSTALL = $(TOP)/bin/minstall +INSTALL = $(SHELL) $(TOP)/bin/minstall # Tools for regenerating glapi (generally only needed by the developers) PYTHON2 = python @@ -84,7 +86,9 @@ APP_LIB_DEPS = -lm # Installation directories (for make install) INSTALL_DIR = /usr/local -DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/$(LIB_DIR)/dri +INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) +INSTALL_INC_DIR = $(INSTALL_DIR)/include +DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) |