|
Lines 1-6
Link Here
|
| 1 |
--- Makefile.orig 2015-05-29 02:13:42 UTC |
1 |
--- Makefile.orig 2015-08-01 03:10:18 UTC |
| 2 |
+++ Makefile |
2 |
+++ Makefile |
| 3 |
@@ -25,6 +25,7 @@ exec_prefix=$(prefix) |
3 |
@@ -23,6 +23,7 @@ exec_prefix=$(prefix) |
| 4 |
bindir=$(exec_prefix)/bin |
4 |
bindir=$(exec_prefix)/bin |
| 5 |
includedir=$(prefix)/include |
5 |
includedir=$(prefix)/include |
| 6 |
libdir=$(exec_prefix)/lib |
6 |
libdir=$(exec_prefix)/lib |
|
Lines 8-24
Link Here
|
| 8 |
INSTALL=install |
8 |
INSTALL=install |
| 9 |
INSTALL_PROGRAM=$(INSTALL) |
9 |
INSTALL_PROGRAM=$(INSTALL) |
| 10 |
INSTALL_DATA=$(INSTALL) -m 644 |
10 |
INSTALL_DATA=$(INSTALL) -m 644 |
| 11 |
@@ -245,13 +246,13 @@ shared-bigtest: $(STESTS) $(SBIGTESTS) |
11 |
@@ -258,13 +259,13 @@ shared-bigtest: $(STESTS) $(SBIGTESTS) |
| 12 |
benchmark: obj/test/regexp_benchmark |
12 |
benchmark: obj/test/regexp_benchmark |
| 13 |
|
13 |
|
| 14 |
install: obj/libre2.a obj/so/libre2.so |
14 |
install: obj/libre2.a obj/so/libre2.$(SOEXT) |
| 15 |
- mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdir)/pkgconfig |
15 |
- mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdir)/pkgconfig |
| 16 |
+ mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdatadir)/pkgconfig |
16 |
+ mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdatadir)/pkgconfig |
| 17 |
$(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2 |
17 |
$(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2 |
| 18 |
$(INSTALL) obj/libre2.a $(DESTDIR)$(libdir)/libre2.a |
18 |
$(INSTALL) obj/libre2.a $(DESTDIR)$(libdir)/libre2.a |
| 19 |
$(INSTALL) obj/so/libre2.so $(DESTDIR)$(libdir)/libre2.so.$(SONAME).0.0 |
19 |
$(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER00) |
| 20 |
ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so.$(SONAME) |
20 |
ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER) |
| 21 |
ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so |
21 |
ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT) |
| 22 |
- sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdir)/pkgconfig/re2.pc |
22 |
- sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdir)/pkgconfig/re2.pc |
| 23 |
+ sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdatadir)/pkgconfig/re2.pc |
23 |
+ sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdatadir)/pkgconfig/re2.pc |
| 24 |
|
24 |
|