it's now skins/modern, not just modern.

2000-05-11 02:11:42 +00:00 · 2000-05-11 02:11:42 +00:00 · b6125b5f13
--- a/themes/modern/Makefile.in
+++ b/themes/modern/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)

 EXPORT_RESOURCE_SAMPLES = \
 	manifest.rdf \
--- a/themes/modern/communicator/Makefile.in
+++ b/themes/modern/communicator/Makefile.in
@ -46,5 +46,5 @@ DIRS = search xpinstall pref sidebar bookmarks directory profile regviewer relat
 include $(topsrcdir)/config/rules.mk

 install::
-	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/$(THEME)/communicator/skin
+	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin

--- a/themes/modern/communicator/bookmarks/Makefile.in
+++ b/themes/modern/communicator/bookmarks/Makefile.in
@ -29,7 +29,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/bookmarks
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/bookmarks

 EXPORT_RESOURCE_SAMPLES = \
        bookmark-folder-closed.gif \
--- a/themes/modern/communicator/directory/Makefile.in
+++ b/themes/modern/communicator/directory/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/directory
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/directory

 EXPORT_RESOURCE_SAMPLES = \
        directory.css \
--- a/themes/modern/communicator/pref/Makefile.in
+++ b/themes/modern/communicator/pref/Makefile.in
@ -1,43 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 2000 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-THEME_ROOT_DEPTH = @srcdir@/../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(THEME_ROOT_DEPTH)/theme.mk
-
-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/pref
-
-EXPORT_RESOURCE_SAMPLES = \
-        pref.css \
-        $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
-
-install::
-	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
-
--- a/themes/modern/communicator/profile/Makefile.in
+++ b/themes/modern/communicator/profile/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/profile
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/profile

 EXPORT_RESOURCE_SAMPLES = \
        newProfile1_2.css \
--- a/themes/modern/communicator/regviewer/Makefile.in
+++ b/themes/modern/communicator/regviewer/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/regviewer
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/regviewer

 EXPORT_RESOURCE_SAMPLES = \
        regviewer.css \
--- a/themes/modern/communicator/related/Makefile.in
+++ b/themes/modern/communicator/related/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/related
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/related

 EXPORT_RESOURCE_SAMPLES = \
        related.css \
--- a/themes/modern/communicator/search/Makefile.in
+++ b/themes/modern/communicator/search/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/search
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/search

 EXPORT_RESOURCE_SAMPLES = \
 		icons.css \
--- a/themes/modern/communicator/sidebar/Makefile.in
+++ b/themes/modern/communicator/sidebar/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/sidebar
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/sidebar

 EXPORT_RESOURCE_SAMPLES = \
        list-up-dis.gif  \
--- a/themes/modern/communicator/wallet/Makefile.in
+++ b/themes/modern/communicator/wallet/Makefile.in
@ -1,46 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 2000 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-THEME_ROOT_DEPTH = @srcdir@/../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(THEME_ROOT_DEPTH)/theme.mk
-
-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/wallet
-
-EXPORT_RESOURCE_SAMPLES = \
-        CookieViewer.css \
-        SignonViewer.css  \
-        WalletEditor.css \
-        wallet.css \
-        $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
-
-install::
-	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
-
--- a/themes/modern/communicator/xpinstall/Makefile.in
+++ b/themes/modern/communicator/xpinstall/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/xpinstall
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/xpinstall

 EXPORT_RESOURCE_SAMPLES = \
        xpinstall.css \
--- a/themes/modern/editor/Makefile.in
+++ b/themes/modern/editor/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/editor/skin
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/editor/skin

 EXPORT_RESOURCE_SAMPLES = \
        EdImageMapPage.css \
--- a/themes/modern/editor/images/Makefile.in
+++ b/themes/modern/editor/images/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/editor/skin/images
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/editor/skin/images

 EXPORT_RESOURCE_SAMPLES = \
 	Map_Copy.gif \
--- a/themes/modern/global/Makefile.in
+++ b/themes/modern/global/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/global/skin
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/global/skin

 EXPORT_RESOURCE_SAMPLES = \
 	alert-icon.gif \
--- a/themes/modern/messenger/Makefile.in
+++ b/themes/modern/messenger/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/messenger/skin
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin

 EXPORT_RESOURCE_SAMPLES = \
 	AccountManager.css \
--- a/themes/modern/messenger/addressbook/Makefile.in
+++ b/themes/modern/messenger/addressbook/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/messenger/skin/addressbook
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/addressbook

 EXPORT_RESOURCE_SAMPLES = \
 		addressbook.css \
--- a/themes/modern/messenger/messengercompose/Makefile.in
+++ b/themes/modern/messenger/messengercompose/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/messenger/skin/messengercompose
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/messengercompose

 EXPORT_RESOURCE_SAMPLES = \
 		messengercompose.css \
--- a/themes/modern/navigator/Makefile.in
+++ b/themes/modern/navigator/Makefile.in
@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk

-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/navigator/skin
+SAMPLES_DIR	= $(DIST)/bin/chrome/skins/$(THEME)/navigator/skin

 EXPORT_RESOURCE_SAMPLES = \
 	NavSecurityOverlay.css \