Move bookmarks resources into their own directory (bug #10341). a=chofmann

build/mac/NGLayoutBuildList.pm

@@ -1182,8 +1182,12 @@ sub MakeResourceAliases()
 	# Install XPFE component resources
 	_InstallResources(":mozilla:xpfe:components:find:resources:MANIFEST",			"$global_chrome_dir:content:default");
 	_InstallResources(":mozilla:xpfe:components:find:resources:locale:MANIFEST",	"$global_chrome_dir:locale");
-	_InstallResources(":mozilla:xpfe:components:bookmarks:resources:MANIFEST",		"$samples_dir");
-	_InstallResources(":mozilla:xpfe:components:bookmarks:resources:locale:en-US:MANIFEST",		"$samples_dir");
+        {
+          my($bookmarks_dir) = "$chrome_dir"."Bookmarks";
+	  _InstallResources(":mozilla:xpfe:components:bookmarks:resources:MANIFEST-content",			"$bookmarks_dir:content:default");
+	  _InstallResources(":mozilla:xpfe:components:bookmarks:resources:MANIFEST-skin",			"$bookmarks_dir:skin:default");
+	  _InstallResources(":mozilla:xpfe:components:bookmarks:resources:locale:MANIFEST",			"$bookmarks_dir:locale");
+        }
         {
           my($history_dir) = "$chrome_dir"."History";
 	  _InstallResources(":mozilla:xpfe:components:history:resources:MANIFEST-content",			"$history_dir:content:default");

rdf/chrome/build/registry.rdf

@@ -199,14 +199,14 @@
 
     <content> 
       <RDF:Description about="chrome://bookmarks/content/">
-	    <base>resource:/res/samples/</base>
+	    <base>resource:/chrome/bookmarks/content/default/</base>
          <main>bookmarks.xul</main> 
       </RDF:Description> 
     </content> 
 
     <skin> 
       <RDF:Description about="chrome://bookmarks/skin/">
-        <base>resource:/res/samples/</base>
+        <base>resource:/chrome/bookmarks/skin/default/</base>
         <main>bookmarks.css</main> 
       </RDF:Description> 
     </skin> 

xpfe/components/bookmarks/resources/MANIFEST-content

@@ -0,0 +1,7 @@
+bm-panel.xul
+bm-props.xul
+bm-props.js
+bookmark-popup.js
+bookmarks.html
+bookmarks.js
+bookmarks.xul

xpfe/components/bookmarks/resources/MANIFEST-skin

@@ -1,15 +1,8 @@
-bm-panel.xul
-bm-props.xul
-bm-props.js
+bookmarks.css
+manage-bookmarks.css
 bookmark-folder-closed.gif
 bookmark-folder-open.gif
 bookmark-item.gif
-bookmark-popup.js
-bookmarks.css
-bookmarks.html
-bookmarks.js
-bookmarks.xul
 iefavorite.gif
-manage-bookmarks.css
 personal-folder-closed.gif
 personal-folder-open.gif

xpfe/components/bookmarks/resources/Makefile.in

@@ -24,27 +24,37 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-FILES = \
-	bm-panel.xul			\
-	bm-props.xul			\
-	bm-props.js			\
-	bookmark-folder-closed.gif	\
-	bookmark-folder-open.gif	\
-	bookmark-item.gif		\
-	bookmark-popup.js		\
-	bookmarks.css			\
-	bookmarks.html			\
-	bookmarks.js			\
-	bookmarks.xul			\
-	iefavorite.gif			\
-	manage-bookmarks.css		\
-	personal-folder-closed.gif	\
-	personal-folder-open.gif	\
+CHROME_DIR          = bookmarks
+CHROME_CONTENT_DIR  = content/default
+CHROME_SKIN_DIR     = skin/default
+CHROME_SOURCE_DIR	= $(srcdir)
+
+CHROME_CONTENT = \
+	bm-panel.xul \
+	bm-props.xul \
+	bm-props.js \
+	bookmark-popup.js \
+	bookmarks.html \
+	bookmarks.js \
+	bookmarks.xul \
+	$(NULL)
+
+CHROME_SKIN = \
+	bookmark-folder-closed.gif \
+	bookmark-folder-open.gif \
+	bookmark-item.gif \
+	bookmarks.css \
+	iefavorite.gif \
+	manage-bookmarks.css \
+	personal-folder-closed.gif \
+	personal-folder-open.gif \
+	$(NULL)
+
+CHROME_L10N = \
 	locale/en-US/bm-props.dtd \
 	locale/en-US/bookmarks.dtd \
 	$(NULL)
 
-FILES := $(addprefix $(srcdir)/, $(FILES))
-
-install::
-	$(INSTALL) $(FILES) $(DIST)/bin/res/samples
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk