aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-04-08 00:34:02 +0800
committerChristian Persch <chpe@src.gnome.org>2008-04-08 00:34:02 +0800
commit2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0 (patch)
tree75926e19ccd7dc39e69bdf8949ce63ab187c2980
parent4f2808813ff54357fa969cf41c57073aee45177a (diff)
downloadgsoc2013-epiphany-2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0.tar
gsoc2013-epiphany-2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0.tar.gz
gsoc2013-epiphany-2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0.tar.bz2
gsoc2013-epiphany-2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0.tar.lz
gsoc2013-epiphany-2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0.tar.xz
gsoc2013-epiphany-2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0.tar.zst
gsoc2013-epiphany-2a0d2f4785a30e9d7ec72d6e36f5ddc838fee3c0.zip
Release 2.22.1.1RELEASE_2_22_1_1
svn path=/branches/gnome-2-22/; revision=8198
-rw-r--r--configure.ac2
-rw-r--r--embed/mozilla/Makefile.am7
2 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index b1f84de40..f9ad28d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
m4_define([epiphany_version_major],[2])
m4_define([epiphany_version_minor],[22])
-m4_define([epiphany_version_micro],[2])
+m4_define([epiphany_version_micro],[1.1])
m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
# This can be either "trunk" or "branches/gnome-x-y"
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index c669d399a..2788e1350 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -166,11 +166,14 @@ libephymozillaembed_la_CXXFLAGS = \
$(DEPENDENCIES_CFLAGS) \
$(AM_CXXFLAGS)
+EXTRA_DIST =
+
if HAVE_GECKO_1_9
xptdir = $(pkgdatadir)/components
xpt_DATA = epiphany.xpt
-noinst_DATA = \
+EXTRA_DIST += \
ephyIAddCertExceptionParams.idl \
- ephyIAddCertExceptionParams.h
+ ephyIAddCertExceptionParams.h \
+ $(xpt_DATA)
endif