diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/mesa/Makefile | 16 | ||||
| -rw-r--r-- | src/mesa/gl.pc.in | 8 |
3 files changed, 8 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 532feaafa8b..a5df38a13fd 100644 --- a/configure.ac +++ b/configure.ac @@ -2185,7 +2185,8 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/dri/r200/Makefile src/mesa/drivers/dri/radeon/Makefile src/mesa/drivers/dri/swrast/Makefile - src/mesa/drivers/x11/Makefile]) + src/mesa/drivers/x11/Makefile + src/mesa/gl.pc]) dnl Sort the dirs alphabetically GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "` diff --git a/src/mesa/Makefile b/src/mesa/Makefile index b17696df4d2..77996768cd5 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -167,18 +167,6 @@ pcedit = \ -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ - -gl_pcedit = sed \ - $(pcedit) \ - -e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \ - -e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \ - -e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \ - -e 's,@GLX_TLS@,$(GLX_TLS),' \ - -e 's,@GL_LIB@,$(GL_LIB),' - -gl.pc: gl.pc.in - $(gl_pcedit) $< > $@ - osmesa_pcedit = sed \ $(pcedit) \ -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \ @@ -193,7 +181,7 @@ install-headers: $(INSTALL) -m 644 $(TOP)/include/GL/*.h \ $(DESTDIR)$(INSTALL_INC_DIR)/GL -install-libgl-pc: gl.pc install-headers +install-libgl-pc: install-headers $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig @@ -220,7 +208,7 @@ clean: -rm -f */*/*.o -rm -f depend depend.bak libmesa.a libmesagallium.a -rm -f drivers/*/*.o - -rm -f *.pc + -rm -f osmesa.pc -rm -f $(BUILT_SOURCES) -@cd drivers/dri && $(MAKE) clean -@cd drivers/x11 && $(MAKE) clean diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in index 2d3bc917ece..181724b97bf 100644 --- a/src/mesa/gl.pc.in +++ b/src/mesa/gl.pc.in @@ -1,12 +1,12 @@ -prefix=@INSTALL_DIR@ +prefix=@prefix@ exec_prefix=${prefix} -libdir=@INSTALL_LIB_DIR@ -includedir=@INSTALL_INC_DIR@ +libdir=@libdir@ +includedir=@includedir@ Name: gl Description: Mesa OpenGL library Requires.private: @GL_PC_REQ_PRIV@ -Version: @VERSION@ +Version: @PACKAGE_VERSION@ Libs: -L${libdir} -l@GL_LIB@ Libs.private: @GL_PC_LIB_PRIV@ Cflags: -I${includedir} @GL_PC_CFLAGS@ |