make things builds with trunk

diff --git a/Makefile.in b/Makefile.in
index 6f8fa2874d2e90ff4a1b0d5f16ab4d5d007c20c1..29260a4470ce3805d9d72751be4ceed3b094d474 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,10 +56,6 @@ DIST_FILES = \
   install.rdf \
   $(NULL)
 
   install.rdf \
   $(NULL)
 

-PREF_JS_EXPORTS = \
-  $(srcdir)/prefs.js \
-  $(NULL)
-

 EXTRA_COMPONENTS = \
   aboutMandelbrot.js \
   $(NULL)
 EXTRA_COMPONENTS = \
   aboutMandelbrot.js \
   $(NULL)

diff --git a/install.rdf b/install.rdf
index c84efdc478c080a178f0126b06b37d44390bbab4..bd4250d45a30030adc0f964767ab9f0433f0b808 100644 (file)
--- a/install.rdf
+++ b/install.rdf
@@ -14,7 +14,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0</em:minVersion>

-        <em:maxVersion>30.0a1</em:maxVersion>
+        <em:maxVersion>38.0a1</em:maxVersion>

       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->
       </Description>
     </em:targetApplication>
     <!-- SeaMonkey -->


@@ -22,7 +22,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>

-        <em:maxVersion>2.27a1</em:maxVersion>
+        <em:maxVersion>2.35a1</em:maxVersion>

       </Description>
     </em:targetApplication>
     <!-- Fennec XUL -->
       </Description>
     </em:targetApplication>
     <!-- Fennec XUL -->


@@ -30,7 +30,7 @@
       <Description>
         <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
         <em:minVersion>4.0</em:minVersion>
       <Description>
         <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
         <em:minVersion>4.0</em:minVersion>

-        <em:maxVersion>30.0a1</em:maxVersion>
+        <em:maxVersion>38.0a1</em:maxVersion>

       </Description>
     </em:targetApplication>
     <!-- toolkit -->
       </Description>
     </em:targetApplication>
     <!-- toolkit -->


@@ -38,7 +38,7 @@
       <Description>
         <em:id>toolkit@mozilla.org</em:id>
         <em:minVersion>2.0</em:minVersion>
       <Description>
         <em:id>toolkit@mozilla.org</em:id>
         <em:minVersion>2.0</em:minVersion>

-        <em:maxVersion>30.0</em:maxVersion>
+        <em:maxVersion>38.0</em:maxVersion>

       </Description>
     </em:targetApplication>
   </Description>
       </Description>
     </em:targetApplication>
   </Description>

diff --git a/moz.build b/moz.build
index de85c4d96b1538e21f2d890759ca2fe3e3c08239..bdafcaf90b23d6e52fd0a1beb65d133d0ef216b9 100644 (file)
--- a/moz.build
+++ b/moz.build
@@ -9,3 +9,5 @@ XPI_NAME = 'mandelbrot'
 export('XPI_NAME')
 
 JAR_MANIFESTS += ['jar.mn']
 export('XPI_NAME')
 
 JAR_MANIFESTS += ['jar.mn']

+
+JS_PREFERENCE_FILES += ['prefs.js']