aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2010-04-08 22:14:23 +0800
committerXan Lopez <xan@gnome.org>2010-04-08 22:14:23 +0800
commit286c36cb576f5824e526c918ada4852d59532622 (patch)
tree1560c893e280be7da90e85a8d049465fc7dc9263
parent387e246e124beb12db50facde83b04dbf04770da (diff)
downloadgsoc2013-epiphany-286c36cb576f5824e526c918ada4852d59532622.tar
gsoc2013-epiphany-286c36cb576f5824e526c918ada4852d59532622.tar.gz
gsoc2013-epiphany-286c36cb576f5824e526c918ada4852d59532622.tar.bz2
gsoc2013-epiphany-286c36cb576f5824e526c918ada4852d59532622.tar.lz
gsoc2013-epiphany-286c36cb576f5824e526c918ada4852d59532622.tar.xz
gsoc2013-epiphany-286c36cb576f5824e526c918ada4852d59532622.tar.zst
gsoc2013-epiphany-286c36cb576f5824e526c918ada4852d59532622.zip
Version the extensions dir with EPIPHANY_API_VERSION
We were using our normal release version, which is not where they are installed.
-rw-r--r--data/epiphany.pc.in2
-rw-r--r--src/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/epiphany.pc.in b/data/epiphany.pc.in
index 150ccb2fb..880f31fd7 100644
--- a/data/epiphany.pc.in
+++ b/data/epiphany.pc.in
@@ -2,7 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
-extensionsdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/extensions
+extensionsdir=@libdir@/epiphany/@EPIPHANY_API_VERSION@/extensions
loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders
datarootdir=@datarootdir@
datadir=@datadir@
diff --git a/src/Makefile.am b/src/Makefile.am
index 712b7f569..fd626dad5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,7 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \
-DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \