diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/Makefile | 18 | ||||
| -rw-r--r-- | src/mesa/osmesa.pc.in | 8 |
2 files changed, 5 insertions, 21 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 77996768cd5..6a6be276fd0 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -161,21 +161,6 @@ install: default $(DRICORE_INSTALL_TARGET) esac ; \ done -pcedit = \ - -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ - -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \ - -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ - -osmesa_pcedit = sed \ - $(pcedit) \ - -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \ - -e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \ - -e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),' - -osmesa.pc: osmesa.pc.in - $(osmesa_pcedit) $< > $@ - install-headers: $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL $(INSTALL) -m 644 $(TOP)/include/GL/*.h \ @@ -186,7 +171,7 @@ install-libgl-pc: install-headers $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig -install-osmesa: default osmesa.pc +install-osmesa: default $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ @@ -208,7 +193,6 @@ clean: -rm -f */*/*.o -rm -f depend depend.bak libmesa.a libmesagallium.a -rm -f drivers/*/*.o - -rm -f osmesa.pc -rm -f $(BUILT_SOURCES) -@cd drivers/dri && $(MAKE) clean -@cd drivers/x11 && $(MAKE) clean diff --git a/src/mesa/osmesa.pc.in b/src/mesa/osmesa.pc.in index 05327f40aa0..307255ffc99 100644 --- a/src/mesa/osmesa.pc.in +++ b/src/mesa/osmesa.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: osmesa Description: Mesa Off-screen Rendering library Requires: @OSMESA_PC_REQ@ -Version: @VERSION@ +Version: @PACKAGE_VERSION@ Libs: -L${libdir} -l@OSMESA_LIB@ Libs.private: @OSMESA_PC_LIB_PRIV@ Cflags: -I${includedir} |