diff options
| author | Horst3180 | 2015-08-27 20:55:37 +0200 |
|---|---|---|
| committer | Horst3180 | 2015-08-27 21:03:06 +0200 |
| commit | 8c0e60f997d70cdb63566f46390546691d947749 (patch) | |
| tree | 817385dcb4158849dad6257e4c85ad2e3aef3e03 /common/Makefile.am | |
| parent | bd550a46d936226801cb9d8cef9ea6273894b51c (diff) | |
| parent | b811483e7f6fb97afa531a873c73a48f48ef8468 (diff) | |
| download | solarc-theme-8c0e60f997d70cdb63566f46390546691d947749.tar.gz solarc-theme-8c0e60f997d70cdb63566f46390546691d947749.tar.xz solarc-theme-8c0e60f997d70cdb63566f46390546691d947749.zip | |
Merge branch 'master' into wip/3.18
Diffstat (limited to 'common/Makefile.am')
| -rw-r--r-- | common/Makefile.am | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 19b2c8a..6e40e8f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -248,20 +248,24 @@ endif # ENABLE_XFWM uninstall-local: rm -rf $(ithemedir) - -rmdir -p $(DESTDIR)$(datadir)/themes 2>/dev/null - - -dist-hook: - cp -r \ - cinnamon \ - gnome-shell \ - gtk-2.0 \ - gtk-3.0 \ - metacity-1 \ - unity \ - xfwm4 \ - xfwm4-dark \ - index.theme \ - index.theme-darker \ - index.theme-dark \ - $(distdir) +if ENABLE_DARKER + rm -rf $(ithemedarkerdir) +endif # ENABLE_DARKER + +if ENABLE_DARK + rm -rf $(ithemedarkdir) +endif # ENABLE_DARK + + +EXTRA_DIST = $(srcdir)/cinnamon \ + $(srcdir)/gnome-shell \ + $(srcdir)/gtk-2.0 \ + $(srcdir)/gtk-3.0 \ + $(srcdir)/metacity-1 \ + $(srcdir)/unity \ + $(srcdir)/xfce-notify-4.0 \ + $(srcdir)/xfwm4 \ + $(srcdir)/xfwm4-dark \ + $(srcdir)/index.theme \ + $(srcdir)/index.theme-darker \ + $(srcdir)/index.theme-dark |