Attachment 5548 Details for Bug 2372 – Patch

[patch] Patch

install-targets2.diff (text/plain), 8.29 KB, created by Tilman Sauerbeck on 2006-05-03 00:14:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tilman Sauerbeck

Created: 2006-05-03 00:14:10 UTC

Size: 8.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/Makefile,v
>retrieving revision 1.66
>diff -u -p -r1.66 Makefile
>--- Makefile	13 Apr 2006 03:00:14 -0000	1.66
>+++ Makefile	2 May 2006 14:11:25 -0000
>@@ -33,8 +33,9 @@ realclean:
> 
> 
> install:
>-	@echo "Installing"
>-	$(TOP)/bin/installmesa $(DESTDIR)
>+	@for dir in $(SUBDIRS) ; do \
>+		(cd $$dir ; $(MAKE) install) || exit 1 ; \
>+	done
> 
> # DirectFBGL module installation
> linux-directfb-install:
>Index: bin/installmesa
>===================================================================
>RCS file: bin/installmesa
>diff -N bin/installmesa
>--- bin/installmesa	14 Feb 2006 14:57:04 -0000	1.7
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,74 +0,0 @@
>-#!/bin/sh
>-
>-#
>-# Simple shell script for installing Mesa's header and library files.
>-# If the copy commands below don't work on a particular system (i.e. the
>-# -f or -d flags), we may need to branch on `uname` to do the right thing.
>-#
>-
>-
>-TOP=.
>-
>-INCLUDE_DIR="/usr/local/include"
>-LIB_DIR="/usr/local/lib"
>-
>-if [ "x$#" = "x0" ] ; then
>-echo
>-echo "***** Mesa installation - You may need root privileges to do this *****"
>-echo
>-echo "Default directory for header files is:" ${INCLUDE_DIR}
>-echo "Enter new directory or press <Enter> to accept this default."
>-
>-read INPUT
>-if [ "x${INPUT}" != "x" ] ; then
>-	INCLUDE_DIR=${INPUT}
>-fi
>-
>-echo
>-echo "Default directory for library files is:" ${LIB_DIR}
>-echo "Enter new directory or press <Enter> to accept this default."
>-
>-read INPUT
>-if [ "x${INPUT}" != "x" ] ; then
>-	LIB_DIR=${INPUT}
>-fi
>-
>-echo
>-echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
>-echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
>-echo "Press <Enter> to continue, or <ctrl>-C to abort."
>-
>-read INPUT
>-
>-else
>-INCLUDE_DIR=$1/include
>-LIB_DIR=$1/lib
>-fi
>-
>-# flags:
>-#  -f = force
>-#  -d = preserve symlinks (does not work on BSD)
>-
>-if [ `uname` = "FreeBSD" ] ; then
>-	CP_FLAGS="-f"
>-elif [ `uname` = "Darwin" ] ; then
>-	CP_FLAGS="-f"
>-elif [ `uname` = "AIX" ] ; then
>-	CP_FLAGS="-fh"
>-else
>-	CP_FLAGS="-fd"
>-fi
>-
>-
>-set -v
>-
>-mkdir ${INCLUDE_DIR}
>-mkdir ${INCLUDE_DIR}/GL
>-mkdir ${INCLUDE_DIR}/GLES
>-mkdir ${LIB_DIR}
>-cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
>-cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL
>-# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
>-cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR}
>-
>-echo "Done."
>Index: configs/aix
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/aix,v
>retrieving revision 1.4
>diff -u -p -r1.4 aix
>--- configs/aix	13 Apr 2006 02:59:29 -0000	1.4
>+++ configs/aix	2 May 2006 14:11:25 -0000
>@@ -10,7 +10,10 @@ CXX = xlC
> 
> CFLAGS = -O -DAIXV3 -DPTHREADS
> 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
>Index: configs/default
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/default,v
>retrieving revision 1.22
>diff -u -p -r1.22 default
>--- configs/default	23 Aug 2005 00:45:54 -0000	1.22
>+++ configs/default	2 May 2006 14:11:26 -0000
>@@ -25,6 +25,7 @@ MKLIB_OPTIONS = 
> MKDEP = makedepend
> MKDEP_OPTIONS = -fdepend
> MAKE = make
>+COPY_LIBS = cp -f -d
> 
> # Python and flags (generally only needed by the developers)
> PYTHON2 = python
>@@ -56,13 +57,16 @@ GLW_SOURCES = GLwDrawA.c
> 
> # Directories
> LIB_DIR = $(TOP)/lib
>-INSTALL_PREFIX = /usr/local
> SRC_DIRS = mesa glu glut/glx glw
> GLU_DIRS = sgi
> DRIVER_DIRS = x11 osmesa
> # Which subdirs under $(TOP)/progs/ to enter:
> PROGRAM_DIRS = demos redbook samples xdemos
> 
>+# Target directories
>+DESTDIR =
>+PREFIX = /usr/local
>+DRI_DRIVER_DIR = /usr/X11R6/lib/modules/dri
> 
> # Library/program dependencies
> EXTRA_LIB_PATH ?=
>Index: progs/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/progs/Makefile,v
>retrieving revision 1.6
>diff -u -p -r1.6 Makefile
>--- progs/Makefile	25 Aug 2004 14:49:41 -0000	1.6
>+++ progs/Makefile	2 May 2006 14:11:26 -0000
>@@ -21,6 +21,8 @@ subdirs:
> 		fi \
> 	done
> 
>+# Dummy install target
>+install:
> 
> clean:
> 	@for dir in $(SUBDIRS) tests ; do \
>Index: src/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/Makefile,v
>retrieving revision 1.5
>diff -u -p -r1.5 Makefile
>--- src/Makefile	25 Aug 2004 14:49:42 -0000	1.5
>+++ src/Makefile	2 May 2006 14:11:27 -0000
>@@ -21,6 +21,12 @@ subdirs:
> 		fi \
> 	done
> 
>+install:
>+	@for dir in $(SUBDIRS) ; do \
>+		if [ -d $$dir ] ; then \
>+			(cd $$dir ; $(MAKE) install) || exit 1 ; \
>+		fi \
>+	done
> 
> $(LIB_DIR):
> 	-mkdir $(LIB_DIR)
>Index: src/glu/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glu/Makefile,v
>retrieving revision 1.3
>diff -u -p -r1.3 Makefile
>--- src/glu/Makefile	1 Jun 2004 00:06:15 -0000	1.3
>+++ src/glu/Makefile	2 May 2006 14:11:27 -0000
>@@ -13,6 +13,9 @@ default: $(TOP)/configs/current
> 		(cd $$dir ; $(MAKE)) ; \
> 	done
> 
>+install:
>+	install -d $(DESTDIR)$(PREFIX)/lib
>+	$(COPY_LIBS) $(TOP)/lib/libGLU* $(DESTDIR)$(PREFIX)/lib
> 
> clean:
> 	@for dir in $(SUBDIRS) ; do \
>Index: src/glut/glx/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glut/glx/Makefile,v
>retrieving revision 1.12
>diff -u -p -r1.12 Makefile
>--- src/glut/glx/Makefile	2 Jan 2006 18:47:00 -0000	1.12
>+++ src/glut/glx/Makefile	2 May 2006 14:11:28 -0000
>@@ -96,6 +96,9 @@ $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OB
> 		$(GLUT_LIB_DEPS) $(OBJECTS)
> 
> 
>+# Dummy install target. FIXME?
>+install:
>+
> clean:
> 	-rm -f *.o *~
> 	-rm -f *.lo
>Index: src/glw/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glw/Makefile,v
>retrieving revision 1.13
>diff -u -p -r1.13 Makefile
>--- src/glw/Makefile	2 Jan 2006 18:47:01 -0000	1.13
>+++ src/glw/Makefile	2 May 2006 14:11:28 -0000
>@@ -25,6 +25,11 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
> 
> default: $(LIB_DIR)/$(GLW_LIB_NAME)
> 
>+install:
>+	install -d $(DESTDIR)$(PREFIX)/{include/GL,lib}
>+	install -m 644 *.h $(DESTDIR)$(PREFIX)/include/GL
>+	
>+	$(COPY_LIBS) $(TOP)/lib/libGLw* $(DESTDIR)$(PREFIX)/lib
> 
> clean:
> 	-rm depend depend.bak
>Index: src/glx/x11/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/x11/Makefile,v
>retrieving revision 1.22
>diff -u -p -r1.22 Makefile
>--- src/glx/x11/Makefile	9 Mar 2006 16:24:46 -0000	1.22
>+++ src/glx/x11/Makefile	2 May 2006 14:11:28 -0000
>@@ -1,7 +1,8 @@
> TOP = ../../..
> include $(TOP)/configs/current
> 
>-EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
>+EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER \
>+                -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_DIR)\"
> 
> SOURCES = \
> 	  glcontextmodes.c \
>@@ -82,6 +83,8 @@ depend: $(SOURCES) $(MESA_GLAPI_SOURCES)
> tags:
> 	etags `find . -name \*.[ch]` `find ../include`
> 
>+# Dummy install target
>+install:
> 
> # Remove .o and backup files
> clean:
>Index: src/mesa/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/Makefile,v
>retrieving revision 1.34
>diff -u -p -r1.34 Makefile
>--- src/mesa/Makefile	14 Sep 2005 02:18:43 -0000	1.34
>+++ src/mesa/Makefile	2 May 2006 14:11:28 -0000
>@@ -152,7 +152,15 @@ install: default
> 	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
> 		cd drivers/dri ; $(MAKE) install ; \
> 	fi
>-
>+	
>+	install -d $(DESTDIR)$(PREFIX)/{include/GL,lib}
>+	install -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(PREFIX)/include/GL
>+	
>+	## NOT YET:
>+	## install -d $(DESTDIR)$(PREFIX)/include/GLES
>+	## install -m 644 include/GLES/*.h $(DESTDIR)$(PREFIX)/include/GLES
>+	
>+	$(COPY_LIBS) $(TOP)/lib/libGL* $(DESTDIR)$(PREFIX)/lib
> 
> # Emacs tags
> tags:
>Index: src/mesa/drivers/dri/Makefile.template
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/Makefile.template,v
>retrieving revision 1.37
>diff -u -p -r1.37 Makefile.template
>--- src/mesa/drivers/dri/Makefile.template	2 May 2006 08:58:42 -0000	1.37
>+++ src/mesa/drivers/dri/Makefile.template	2 May 2006 14:11:28 -0000
>@@ -99,6 +99,7 @@ clean:
> 	-rm -f depend depend.bak
> 
> install: $(LIBNAME)
>-	install $(LIBNAME) /usr/X11R6/lib/modules/dri/$(LIBNAME)
>+	install -d $(DESTDIR)$(DRI_DRIVER_DIR)
>+	install -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_DIR)
> 
> include depend

Actions: View | Splinter Review

Attachments on bug 2372: 5520 | 5548

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.