From 2972de1b747a88a37e0f6e966577c19a4598366f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 23 Aug 2015 13:38:23 +0200 Subject: [PATCH] fix distcheck --- common/Makefile.am | 37 ++++++++++++++++++++++--------------- extra/Makefile.am | 7 ++----- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 19b2c8a..d6f732a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -246,22 +246,29 @@ endif # ENABLE_XFWM uninstall-local: + +if ENABLE_LIGHT rm -rf $(ithemedir) +endif # ENABLE_LIGHT - -rmdir -p $(DESTDIR)$(datadir)/themes 2>/dev/null +if ENABLE_DARKER + rm -rf $(ithemedarkerdir) +endif # ENABLE_DARKER + +if ENABLE_DARK + rm -rf $(ithemedarkdir) +endif # ENABLE_DARK -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) +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 diff --git a/extra/Makefile.am b/extra/Makefile.am index 706c601..a21d248 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -1,5 +1,2 @@ -dist-hook: - cp -r \ - Chrome \ - Arc-Plank \ - $(distdir) +EXTRA_DIST = $(srcdir)/Chrome \ + $(srcdir)/Arc-Plank