diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 3 | ||||
| -rw-r--r-- | src/mesa/Makefile.old | 13 |
3 files changed, 5 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index b2f561d6bf4..879a50702b4 100644 --- a/configure.ac +++ b/configure.ac @@ -879,12 +879,7 @@ if test "x$enable_dri" = xyes; then fi if test "x$enable_osmesa" = xyes; then - # the empty space matters for osmesa... (see src/mesa/Makefile) - if test -n "$DRIVER_DIRS"; then - DRIVER_DIRS="$DRIVER_DIRS osmesa" - else - DRIVER_DIRS="osmesa" - fi + DRIVER_DIRS="$DRIVER_DIRS osmesa" fi AC_SUBST([SRC_DIRS]) diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 6a2d4252bf8..5e764cddc9f 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -21,6 +21,9 @@ SUBDIRS = x86 x86-64 . libdricore drivers +gldir = $(includedir)/GL +gl_HEADERS = $(top_srcdir)/include/GL/*.h + all-local: $(MAKE) -f Makefile.old diff --git a/src/mesa/Makefile.old b/src/mesa/Makefile.old index 7a7d651898e..b7f905c385f 100644 --- a/src/mesa/Makefile.old +++ b/src/mesa/Makefile.old @@ -122,21 +122,10 @@ depend: $(ALL_FILES) main/git_sha1.h install: default $(DRICORE_INSTALL_TARGET) @for driver in $(DRIVER_DIRS) ; do \ case "$$driver" in \ - osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \ - $(MAKE) -f Makefile.old install-headers install-osmesa || exit 1 ; \ - else \ - $(MAKE) -f Makefile.old install-osmesa || exit 1 ; \ - fi ;; \ - dri) $(MAKE) -f Makefile.old install-headers || exit 1 ;; \ - *) $(MAKE) -f Makefile.old install-headers || exit 1 ;; \ + osmesa) $(MAKE) -f Makefile.old install-osmesa || exit 1 ;; \ esac ; \ done -install-headers: - $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL - $(INSTALL) -m 644 $(TOP)/include/GL/*.h \ - $(DESTDIR)$(INSTALL_INC_DIR)/GL - install-osmesa: default $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ $(DESTDIR)$(INSTALL_LIB_DIR) |