summaryrefslogtreecommitdiff
path: root/src/themes
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2002-07-24 18:28:56 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-07-24 18:28:56 +0000
commit88a0d1ff032093f93233c6faacef2689a989c2bc (patch)
tree012e91a115ce140a2bb5a95e67c23ee6d43aa26d /src/themes
parent28958e51ef1f5db825366b08c401442f6c0c93da (diff)
downloadmetacity-88a0d1ff032093f93233c6faacef2689a989c2bc.tar.gz
metacity-88a0d1ff032093f93233c6faacef2689a989c2bc.tar.bz2
look for themes in ~/.themes/NAME/metacity-1/ and
2002-07-24 Havoc Pennington <hp@redhat.com> * src/theme-parser.c (meta_theme_load): look for themes in ~/.themes/NAME/metacity-1/ and datadir/themes/NAME/metacity-1 instead of the old locations. * src/themes/Makefile.am: install themes to datadir/themes/NAME/metacity-1/ to match how GTK works, breaking third-party themes yet again! woot!
Diffstat (limited to 'src/themes')
-rw-r--r--src/themes/Makefile.am22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/themes/Makefile.am b/src/themes/Makefile.am
index 6e5845f..2dcf344 100644
--- a/src/themes/Makefile.am
+++ b/src/themes/Makefile.am
@@ -5,18 +5,20 @@ THEMES= \
Esco \
Gorilla
-THEME_DIR=$(pkgdatadir)/themes
+THEME_DIR=$(datadir)/themes
+THEME_SUBDIR=metacity-1
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(THEME_DIR); \
- for THEME in $(THEMES); do \
- echo '-- Installing theme '$$THEME; \
- $(mkinstalldirs) $(DESTDIR)$(THEME_DIR)/$$THEME; \
- (installfiles=`find $(srcdir)/$$THEME -name "*.png" -o -name "*.xml"`; \
- for i in $$installfiles; do \
- echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(THEME_DIR)/$$THEME; \
- done) \
+ $(mkinstalldirs) $(DESTDIR)$(THEME_DIR); \
+ for THEME in $(THEMES); do \
+ echo '-- Installing theme '$$THEME; \
+ $(mkinstalldirs) $(DESTDIR)$(THEME_DIR)/$$THEME; \
+ $(mkinstalldirs) $(DESTDIR)$(THEME_DIR)/$$THEME/$(THEME_SUBDIR); \
+ (installfiles=`find $(srcdir)/$$THEME -name "*.png" -o -name "*.xml"`; \
+ for i in $$installfiles; do \
+ echo '-- Installing '$$i ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(THEME_DIR)/$$THEME/$(THEME_SUBDIR) ; \
+ done) \
done
dist-hook: