port bug 1155776, bug 1155816, bug 870370 (moves from Makefile.in to moz.build)

[mandelbrot.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 901d4d60f7555d1dfcd186d9f32eea254454e0ac..b77274dcee1272da9a5400cfaaa27d91208f48d2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,9 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 EXTENSION_VERSION      = 4.0.1
 
 XPI_NAME               = mandelbrot
-USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
-NO_JS_MANIFEST         = 1
 INSTALL_EXTENSION_ID   = mandelbrot@kairo.at
 XPI_PKGNAME            = mandelbrot-$(EXTENSION_VERSION)
 
@@ -56,14 +54,6 @@ DIST_FILES = \
   install.rdf \
   $(NULL)
 
-PREF_JS_EXPORTS = \
-  $(srcdir)/prefs.js \
-  $(NULL)
-
-EXTRA_COMPONENTS = \
-  aboutMandelbrot.js \
-  $(NULL)
-
 # include config.mk before using the AB_CD var
 include $(topsrcdir)/config/config.mk
 
@@ -74,7 +64,7 @@ DEFINES += -DAB_CD=en-US \
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_OMNIJAR
-ABS_DIST = $(call core_abspath,$(DIST)/bin)
+ABS_DIST = $(abspath $(DIST)/bin)
 
 libs::
        @echo "Packaging $(INSTALL_EXTENSION_ID).xpi"