1 [Modified to apply to 7.4.1 tarballs] |
1 --- configs/default Fri Feb 12 15:56:33 2010 |
2 |
2 +++ configs/default Mon Mar 1 09:53:26 2010 |
3 From 854cf5fedb3c0dd5879083dd08d0389e419e312d Mon Sep 17 00:00:00 2001 |
3 @@ -121,6 +121,7 @@ |
4 From: Alan Coopersmith <[email protected]> |
|
5 Date: Sun, 10 May 2009 18:57:27 -0700 |
|
6 Subject: [PATCH] Define INSTALL_PC_DIR for pkgconfig file installation path |
|
7 |
|
8 Give builders/packagers a single variable to override if needed |
|
9 |
|
10 Signed-off-by: Alan Coopersmith <[email protected]> |
|
11 --- |
|
12 configs/default | 1 + |
|
13 src/glu/Makefile | 4 ++-- |
|
14 src/glut/glx/Makefile | 4 ++-- |
|
15 src/glut/mini/Makefile | 4 ++-- |
|
16 src/glw/Makefile | 4 ++-- |
|
17 src/mesa/Makefile | 8 ++++---- |
|
18 src/mesa/drivers/dri/Makefile | 4 ++-- |
|
19 7 files changed, 15 insertions(+), 14 deletions(-) |
|
20 |
|
21 diff --git a/configs/default b/configs/default |
|
22 index 9c479fc..474abd6 100644 |
|
23 --- a/configs/default |
|
24 +++ b/configs/default |
|
25 @@ -117,6 +117,7 @@ APP_LIB_DEPS = -lm |
|
26 INSTALL_DIR = /usr/local |
4 INSTALL_DIR = /usr/local |
27 INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) |
5 INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) |
28 INSTALL_INC_DIR = $(INSTALL_DIR)/include |
6 INSTALL_INC_DIR = $(INSTALL_DIR)/include |
29 +INSTALL_PC_DIR = $(INSTALL_LIB_DIR)/pkgconfig |
7 +INSTALL_PC_DIR = $(INSTALL_LIB_DIR)/pkgconfig |
30 DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri |
8 DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri |
31 |
9 |
32 # Where libGL will look for DRI hardware drivers |
10 # Where libGL will look for DRI hardware drivers |
33 diff --git a/src/glu/Makefile b/src/glu/Makefile |
11 --- src/glu/Makefile Mon Mar 1 09:54:01 2010 |
34 index 5c26ead..15bb467 100644 |
12 +++ src/glu/Makefile Mon Mar 1 09:56:50 2010 |
35 --- a/src/glu/Makefile |
13 @@ -29,9 +29,9 @@ |
36 +++ b/src/glu/Makefile |
|
37 @@ -29,9 +29,9 @@ glu.pc: glu.pc.in |
|
38 |
14 |
39 install: glu.pc |
15 install: glu.pc |
40 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
16 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
41 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
17 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
42 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
18 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
43 $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) |
19 $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) |
44 - $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
20 - $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
45 + $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_PC_DIR) |
21 + $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_PC_DIR) |
46 |
22 |
47 clean: |
23 clean: |
48 -@for dir in $(SUBDIRS) ; do \ |
24 -@for dir in $(SUBDIRS) ; do \ |
49 diff --git a/src/glw/Makefile b/src/glw/Makefile |
25 --- src/glw/Makefile Mon Mar 1 09:57:10 2010 |
50 index d88d773..34517f1 100644 |
26 +++ src/glw/Makefile Mon Mar 1 09:57:34 2010 |
51 --- a/src/glw/Makefile |
27 @@ -41,10 +41,10 @@ |
52 +++ b/src/glw/Makefile |
|
53 @@ -41,10 +41,10 @@ glw.pc: glw.pc.in |
|
54 install: glw.pc |
28 install: glw.pc |
55 $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL |
29 $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL |
56 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
30 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
57 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
31 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
58 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
32 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
59 $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL |
33 $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL |
60 $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) |
34 $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) |
61 - $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
35 - $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
62 + $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_PC_DIR) |
36 + $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_PC_DIR) |
63 |
37 |
64 clean: |
38 clean: |
65 -rm -f depend depend.bak |
39 -rm -f depend depend.bak |
66 diff --git a/src/mesa/Makefile b/src/mesa/Makefile |
40 --- src/mesa/Makefile Mon Mar 1 09:57:46 2010 |
67 index bb18bee..49b1504 100644 |
41 +++ src/mesa/Makefile Mon Mar 1 10:01:04 2010 |
68 --- a/src/mesa/Makefile |
42 @@ -128,17 +128,17 @@ |
69 +++ b/src/mesa/Makefile |
|
70 @@ -128,17 +128,17 @@ install-headers: |
|
71 |
43 |
72 install-libgl: default gl.pc install-headers |
44 install-libgl: default gl.pc install-headers |
73 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
45 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
74 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
46 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
75 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
47 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
76 $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ |
48 $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ |
77 $(DESTDIR)$(INSTALL_LIB_DIR) |
49 $(DESTDIR)$(INSTALL_LIB_DIR) |
78 - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
50 - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
79 + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_PC_DIR) |
51 + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_PC_DIR) |
80 |
52 |
81 install-osmesa: default osmesa.pc |
53 install-osmesa: default osmesa.pc |
82 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
54 $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) |
83 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
55 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
84 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
56 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
85 $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ |
57 $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ |
86 $(DESTDIR)$(INSTALL_LIB_DIR) |
58 $(DESTDIR)$(INSTALL_LIB_DIR) |
87 - $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
59 - $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
88 + $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_PC_DIR) |
60 + $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_PC_DIR) |
89 |
61 |
90 install-dri: default |
62 install-dri: default |
91 cd drivers/dri && $(MAKE) install |
63 cd drivers/dri && $(MAKE) install |
92 diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile |
|
93 index 32db097..e38c59a 100644 |
|
94 --- a/src/mesa/drivers/dri/Makefile |
|
95 +++ b/src/mesa/drivers/dri/Makefile |
|
96 @@ -41,8 +41,8 @@ install: dri.pc |
|
97 $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal |
|
98 $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \ |
|
99 $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal |
|
100 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
|
101 - $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig |
|
102 + $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR) |
|
103 + $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_PC_DIR) |
|
104 |
64 |
105 |
|
106 clean: |
|
107 -- |
|
108 1.5.6.5 |
|
109 |
|