[epiphany] Use $(pkglibdir) instead of $(libdir)/epiphany
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Use $(pkglibdir) instead of $(libdir)/epiphany
- Date: Tue, 31 Jul 2012 15:36:42 +0000 (UTC)
commit ee276bcbe7ce834b0e20bf9141a1155c3f472d6b
Author: Michael Biebl <biebl debian org>
Date: Tue Jul 31 17:24:00 2012 +0200
Use $(pkglibdir) instead of $(libdir)/epiphany
to avoid hard coding the package name.
https://bugzilla.gnome.org/show_bug.cgi?id=672023
lib/Makefile.am | 2 +-
src/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7e5ba55..ba15f27 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -88,7 +88,7 @@ libephymisc_la_CPPFLAGS = \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \
+ -DEXTENSIONS_DIR=\""$(pkglibdir)/$(EPIPHANY_API_VERSION)/extensions"\" \
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
diff --git a/src/Makefile.am b/src/Makefile.am
index d7725fb..61b6fbe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,8 +95,8 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/history \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \
- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
+ -DEXTENSIONS_DIR=\""$(pkglibdir)/$(EPIPHANY_API_VERSION)/extensions"\" \
+ -DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\" \
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]