aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-07-31 23:24:00 +0800
committerClaudio Saavedra <csaavedra@igalia.com>2012-07-31 23:36:11 +0800
commitee276bcbe7ce834b0e20bf9141a1155c3f472d6b (patch)
treec1470604589dfbc42e4f336a92aa431dc5a84be1
parente6f6e2a0ce6497c69e3ebdd28b86f3437d8d3266 (diff)
downloadgsoc2013-epiphany-ee276bcbe7ce834b0e20bf9141a1155c3f472d6b.tar
gsoc2013-epiphany-ee276bcbe7ce834b0e20bf9141a1155c3f472d6b.tar.gz
gsoc2013-epiphany-ee276bcbe7ce834b0e20bf9141a1155c3f472d6b.tar.bz2
gsoc2013-epiphany-ee276bcbe7ce834b0e20bf9141a1155c3f472d6b.tar.lz
gsoc2013-epiphany-ee276bcbe7ce834b0e20bf9141a1155c3f472d6b.tar.xz
gsoc2013-epiphany-ee276bcbe7ce834b0e20bf9141a1155c3f472d6b.tar.zst
gsoc2013-epiphany-ee276bcbe7ce834b0e20bf9141a1155c3f472d6b.zip
Use $(pkglibdir) instead of $(libdir)/epiphany
to avoid hard coding the package name. https://bugzilla.gnome.org/show_bug.cgi?id=672023
-rw-r--r--lib/Makefile.am2
-rw-r--r--src/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7e5ba5537..ba15f2706 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 d7725fb50..61b6fbecc 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)