diff options
| author | Jon TURNEY <[email protected]> | 2012-07-26 11:07:37 +0100 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2012-07-31 12:48:33 +0100 |
| commit | 27013e5164a1823d5bdcb5ca21ae4ca0df40b8f8 (patch) | |
| tree | 8e7d259003296b6a557b18570447306d5830e456 /src/mesa/Makefile.am | |
| parent | 2faa2b4f7e4d5a230d5e2ec55bea06eab8dd8fba (diff) | |
Move installing osmesa.pc to drivers/osmesa
Move installing osmesa.pc to drivers/osmesa, where it belongs better
This also restores the installation of gl.pc if we are building osmesa at the
same time as libGL, which was broken in commit 39785488 when the .pc
installation was converted to automake
v2:
Remove HAVE_OSMESA_DRIVER automake conditional, it's now pointless as we
will only be building in the drivers/osmesa directory if the condition it
checked was true.
Signed-off-by: Jon TURNEY <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/Makefile.am')
| -rw-r--r-- | src/mesa/Makefile.am | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 2ec57ea912b..bb70ed6ea36 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -140,12 +140,7 @@ all-local: libmesa.la libmesagallium.la CLEANFILES += libmesa.a libmesagallium.a pkgconfigdir = $(libdir)/pkgconfig - -if HAVE_OSMESA_DRIVER -pkgconfig_DATA = osmesa.pc -else pkgconfig_DATA = gl.pc -endif # Emacs tags tags: |