Commit 49cc3d25 authored by Karel Slaný's avatar Karel Slaný

Mozilla js-ctypes package name contains architecture.

parent 2ef4a5d2
......@@ -89,7 +89,7 @@ $(top_srcdir)/add-on/firefox/common/install.rdf: $(top_srcdir)/add-on/firefox/co
if EXTPKG_MOZZ_JC
TARGETS += \
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes.xpi
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes-$(OS_TARGET)$(XPCOM_ABI).xpi
BUILT_SOURCES += \
$(top_srcdir)/add-on/firefox/js-ctypes/content/dnsseclib.js \
......@@ -217,7 +217,7 @@ _dtvmjc_workdir/platform/libDANEcore-$(OS_TARGET)$(XPCOM_ABI_SUFF_64)$(SO_SUFF):
$(INSTALL) -m 644 $(top_srcdir)/core_js-ctypes/bits-64/libDANEcore$(SO_SUFF) $@ # FIXME: Ugly
$(STRIP) $@
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes.xpi: dtvmjc-jar-stamp dtvmjc-prefs-stamp dtvmjc-ballast-stamp $(JC_DNSSEC_CORE) $(JC_DANE_CORE)
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes-$(OS_TARGET)$(XPCOM_ABI).xpi: dtvmjc-jar-stamp dtvmjc-prefs-stamp dtvmjc-ballast-stamp $(JC_DNSSEC_CORE) $(JC_DANE_CORE)
-rm -f $@
cd _dtvmjc_workdir; \
zip -r $@ COPYING README icon.png Version CHANGELOG platform defaults chrome install.rdf chrome.manifest; \
......@@ -234,9 +234,9 @@ CLEANFILES += \
dtvmjc-jar-stamp \
dtvmjc-prefs-stamp \
dtvmjc-ballast-stamp \
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes.xpi
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes-$(OS_TARGET)$(XPCOM_ABI).xpi
install-data-local: mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes.xpi
install-data-local: mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-js-ctypes-$(OS_TARGET)$(XPCOM_ABI).xpi
@for dir in $(MF_JC_INSTDIRS); do \
echo $${dir}; \
$(INSTALL) -d -m 755 $${dir}/dnssec@nic.cz; \
......@@ -256,7 +256,7 @@ endif
if EXTPKG_MOZZ_NP
TARGETS += \
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-npapi.xpi
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-npapi-$(OS_TARGET)$(XPCOM_ABI).xpi
#BUILT_SOURCES +=
......@@ -339,7 +339,7 @@ dtvmnp-tlsa-core-stamp:
fi
touch $@
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-npapi.xpi: dtvmnp-jar-stamp dtvmnp-prefs-stamp dtvmnp-ballast-stamp dtvmnp-dnssec-core-stamp dtvmnp-tlsa-core-stamp
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-npapi-$(OS_TARGET)$(XPCOM_ABI).xpi: dtvmnp-jar-stamp dtvmnp-prefs-stamp dtvmnp-ballast-stamp dtvmnp-dnssec-core-stamp dtvmnp-tlsa-core-stamp
-rm -f $@
cd _dtvmnp_workdir; \
zip -r $@ COPYING README icon.png Version CHANGELOG plugins defaults chrome install.rdf chrome.manifest; \
......@@ -358,6 +358,6 @@ CLEANFILES += \
dtvmnp-ballast-stamp \
dtvmnp-dnssec-core-stamp \
dtvmnp-tlsa-core-stamp \
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-npapi.xpi
mf-dnssec-tlsa-validator-@PACKAGE_VERSION@-npapi-$(OS_TARGET)$(XPCOM_ABI).xpi
endif
......@@ -120,7 +120,7 @@ AS_CASE([$host_cpu],
[i[[3456]]86], [XPCOM_ABI=x86],
[amd64|x86_64], [XPCOM_ABI=x86_64],
)
#AC_SUBST(XPCOM_ABI)
AC_SUBST(XPCOM_ABI)
# Set shared library prefixes and suffixes.
AS_CASE([$host_os],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment