diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-20 21:28:18 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-20 21:28:18 (GMT) |
| commit | 1b49f91a3eb89523a11d7b616ad189d7bb57eff6 (patch) | |
| tree | 6038e4ea634ad4527b1941869ce2502298c187a3 | |
| parent | 20f9a0fcd51e5edc7ea5c66fb655cd028319100d (diff) | |
Fix distcheck. Better way of figuring out libxul dir.v0.4.1
Release 0.4.1
| -rw-r--r-- | components/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/chrome/Makefile.am | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/components/Makefile.am b/components/Makefile.am index 23d2895..1f4466a 100644 --- a/components/Makefile.am +++ b/components/Makefile.am @@ -8,7 +8,7 @@ xpt_DATA = $(xpt_in_files:.idl=.xpt) componentsdir = $(pkglibdir)/components components_DATA = hulahopAddCertException.js -EXTRA_DIST = $(xpt_in_files) +EXTRA_DIST = $(xpt_in_files) $(components_DATA) CLEANFILES = $(xpt_DATA) diff --git a/configure.ac b/configure.ac index 2cd5928..4b3c2eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([hulahop],[0.4.0],[],[hulahop]) +AC_INIT([hulahop],[0.4.1],[],[hulahop]) AC_PREREQ([2.59]) @@ -26,7 +26,7 @@ PKG_CHECK_MODULES([LIBXUL],[libxul]) # FIXME To be able to use pyxpcom we currently need # to link to xpcom at build time. Which involves various hacks. LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul` -LIBXUL_DIR=`echo $LIBXUL_SDK_DIR | sed -e 's/-devel//'` +LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`$PKG_CONFIG --modversion libxul`" LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom" LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul` diff --git a/data/chrome/Makefile.am b/data/chrome/Makefile.am index e38f1a2..d319915 100644 --- a/data/chrome/Makefile.am +++ b/data/chrome/Makefile.am @@ -14,7 +14,8 @@ globalchrome_DATA = netError.dtd EXTRA_DIST = \ $(manifest_in_files) \ $(branding_in_files) \ - $(globalchrome_DATA) + $(globalchrome_DATA) \ + $(branding_DATA) CLEANFILES = \ $(manifest_DATA) |