From 0b2dd94b1450844627f91aebd3fcb681d1c61f14 Mon Sep 17 00:00:00 2001
From: Nico <NicoHood@users.noreply.github.com>
Date: Sat, 13 Jan 2018 15:44:38 +0100
Subject: [PATCH] Added plank theme to makefile (#31)

* Added plank theme to makefile
* Add new plank installation method to the readme
* Update readme for plank
---
 README.md          |  3 ++-
 common/Makefile.am |  4 ++--
 configure.ac       |  1 +
 extra/Makefile.am  | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1c8c0fa..3fbe2d5 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,7 @@ Other options to pass to autogen.sh are
     --disable-metacity         disable Metacity support
     --disable-unity            disable Unity support
     --disable-xfwm             disable XFWM support
+    --disable-plank            disable Plank theme support
 
     --with-gnome=<version>     build the theme for a specific GNOME version (3.18, 3.20, 3.22)
                                Note 1: Normally the correct version is detected automatically and this
@@ -117,7 +118,7 @@ A port of Arc for the Plasma 5 desktop with a few additions and extras. Availabl
 The Arc icon theme is available at https://github.com/horst3180/arc-icon-theme
 
 ### Plank theme
-To install the Plank theme, copy the `extra/Arc-Plank` folder to `~/.local/share/plank/themes` or to `/usr/share/plank/themes` for system-wide use.
+As of version `20180114` the plank theme will be installed along with the normal arc gtk theme. You can disable the install by passing `disable-plank` to the autogen command.
 Now open the Plank preferences window by executing `plank --preferences` from a terminal and select `Arc-Plank` as the theme.
 
 ### Arc-Dark for Ubuntu Software Center
diff --git a/common/Makefile.am b/common/Makefile.am
index 999ae89..2652dc3 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -9,8 +9,8 @@ themedarkdir    = $(datadir)/themes/Arc-Dark
 endif
 
 ithemedir       = $(DESTDIR)$(themedir)
-ithemedarkerdir   = $(DESTDIR)$(themedarkerdir)
-ithemedarkdir  = $(DESTDIR)$(themedarkdir)
+ithemedarkerdir = $(DESTDIR)$(themedarkerdir)
+ithemedarkdir   = $(DESTDIR)$(themedarkdir)
 
 install-exec-hook:
 
diff --git a/configure.ac b/configure.ac
index 2b7b5af..8c539cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@ ARC_ENABLE([METACITY],      [metacity],      [Metacity],      [disable])
 ARC_ENABLE([UNITY],         [unity],         [Unity],         [disable])
 ARC_ENABLE([XFWM],          [xfwm],          [XFWM],          [disable])
 ARC_ENABLE([TRANSPARENCY],  [transparency],  [transparency],  [disable])
+ARC_ENABLE([PLANK],         [plank],         [Plank theme],   [disable])
 
 AS_IF([test "x$ENABLE_GNOME_SHELL$ENABLE_GTK3" != xnono], [ARC_GNOME])
 
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 8ceea63..2c06227 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -1 +1,42 @@
+if !ENABLE_TRANSPARENCY
+themedir        = $(datadir)/themes/Arc-solid
+themedarkerdir  = $(datadir)/themes/Arc-Darker-solid
+themedarkdir    = $(datadir)/themes/Arc-Dark-solid
+else
+themedir        = $(datadir)/themes/Arc
+themedarkerdir  = $(datadir)/themes/Arc-Darker
+themedarkdir    = $(datadir)/themes/Arc-Dark
+endif
+
+ithemedir       = $(DESTDIR)$(themedir)
+ithemedarkerdir = $(DESTDIR)$(themedarkerdir)
+ithemedarkdir   = $(DESTDIR)$(themedarkdir)
+
+
+install-exec-hook:
+
+install-data-local:
+
+if ENABLE_PLANK
+
+if ENABLE_LIGHT
+	$(MKDIR_P) $(ithemedir)
+	cp -R $(srcdir)/Arc-Plank/. $(ithemedir)/plank
+endif # ENABLE_LIGHT
+
+if ENABLE_DARKER
+	$(MKDIR_P) $(ithemedarkerdir)
+	cp -R $(srcdir)/Arc-Plank/. $(ithemedarkerdir)/plank
+endif # ENABLE_DARKER
+
+if ENABLE_DARK
+	$(MKDIR_P) $(ithemedarkdir)
+	cp -R $(srcdir)/Arc-Plank/. $(ithemedarkdir)/plank
+endif # ENABLE_DARK
+endif # ENABLE_PLANK
+
+
+uninstall-local:
+
+
 EXTRA_DIST = $(srcdir)/Arc-Plank