From 430c645914a8071bed7417656f27217a5878997d Mon Sep 17 00:00:00 2001 From: mengning997 Date: Tue, 13 Sep 2022 15:59:37 +0800 Subject: [PATCH] mod install path --- Makefile | 17 ++++++++--------- README.md | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5ec5e5c..fa636df 100644 --- a/Makefile +++ b/Makefile @@ -305,7 +305,7 @@ static: obj/libre2.a .PHONY: static-install static-install: obj/libre2.a common-install $(INSTALL) target/release/librure.a /usr/lib/librure.a - $(INSTALL) obj/libre2.a $(DESTDIR)$(libdir)/libre2.a + $(INSTALL) obj/libre2.a /usr/lib/libre2.a .PHONY: shared @@ -313,21 +313,20 @@ shared: obj/so/libre2.$(SOEXT) .PHONY: shared-install shared-install: obj/so/libre2.$(SOEXT) common-install - $(INSTALL) regex-capi/include/rure.h $(DESTDIR)$(includedir)/rure.h - $(INSTALL) target/release/librure.so $(DESTDIR)$(libdir)/librure.so $(INSTALL) target/release/librure.so /usr/lib/librure.so - $(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2rust.$(SOEXTVER00) - ln -sf libre2rust.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2rust.$(SOEXTVER) - ln -sf libre2rust.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2rust.$(SOEXT) - $(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER00) - ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER) - ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT) + $(INSTALL) obj/so/libre2.$(SOEXT) /usr/lib/libre2rust.$(SOEXTVER00) + ln -sf libre2rust.$(SOEXTVER00) /usr/lib/libre2rust.$(SOEXTVER) + ln -sf libre2rust.$(SOEXTVER00) /usr/lib/libre2rust.$(SOEXT) + $(INSTALL) obj/so/libre2.$(SOEXT) /usr/lib/libre2.$(SOEXTVER00) + ln -sf libre2.$(SOEXTVER00) /usr/lib/libre2.$(SOEXTVER) + ln -sf libre2.$(SOEXTVER00) /usr/lib/libre2.$(SOEXT) @ldconfig .PHONY: common-install common-install: @mkdir -p $(DESTDIR)$(includedir)/re2 # $(DESTDIR)$(libdir)/pkgconfig $(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2 + $(INSTALL) regex-capi/include/rure.h $(DESTDIR)$(includedir)/rure.h # $(INSTALL_DATA) re2.pc $(DESTDIR)$(libdir)/pkgconfig/re2.pc # $(SED_INPLACE) -e "s#@includedir@#$(includedir)#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc # $(SED_INPLACE) -e "s#@libdir@#$(libdir)#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc diff --git a/README.md b/README.md index b6eadaa..5ae1dd9 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,24 @@ $ cd re2-rust ### 编译、安装re2-rust +使用openEuler 22.03-LTS + +``` Shell +dnf install git +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh +source "$HOME/.cargo/env" +dnf install g++ +git clone https://gitee.com/openeuler/re2-rust.git +cd re2-rust +make +make install +make test +g++ ../testinstall.cc -o testinstall -lre2 +./testinstall +``` + +Ubuntu 20.04 + ``` Shell $ mkdir build && cd build $ cmake .. -- Gitee