From 26f77e056537c8136e613774b3d2568bf4d57779 Mon Sep 17 00:00:00 2001
From: Vincent Dupont <vincent@otakeys.com>
Date: Thu, 12 Apr 2018 09:54:04 +0200
Subject: [PATCH] pkg/spiffs: clean-up makefiles

---
 pkg/spiffs/Makefile         | 10 ++--------
 pkg/spiffs/Makefile.include |  2 +-
 pkg/spiffs/Makefile.spiffs  |  3 +++
 3 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 pkg/spiffs/Makefile.spiffs

diff --git a/pkg/spiffs/Makefile b/pkg/spiffs/Makefile
index ee77abd5eb..7de6d0c840 100644
--- a/pkg/spiffs/Makefile
+++ b/pkg/spiffs/Makefile
@@ -1,19 +1,13 @@
 PKG_NAME=spiffs
 PKG_URL=https://github.com/pellepl/spiffs.git
 PKG_VERSION=287148c46587089c4543a21eef2d6e9e14b88364
-PKG_BUILDDIR ?= $(PKGDIRBASE)/$(PKG_NAME)
+PKG_LICENSE=MIT
 
 CFLAGS += -std=c11
 
 .PHONY: all
 
 all: git-download
-	@mkdir -p "$(PKG_BUILDDIR)/riotbuild"
-	@cp $(PKG_BUILDDIR)/src/*.c $(PKG_BUILDDIR)/src/*.h $(PKG_BUILDDIR)/riotbuild
-
-	@echo 'MODULE:=spiffs' > $(PKG_BUILDDIR)/riotbuild/Makefile
-	@echo 'include $$(RIOTBASE)/Makefile.base' >> $(PKG_BUILDDIR)/riotbuild/Makefile
-
-	"$(MAKE)" -C $(PKG_BUILDDIR)/riotbuild
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.spiffs
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/spiffs/Makefile.include b/pkg/spiffs/Makefile.include
index d25a221f4e..4e77c3a5e2 100644
--- a/pkg/spiffs/Makefile.include
+++ b/pkg/spiffs/Makefile.include
@@ -1,5 +1,5 @@
 INCLUDES += -I$(RIOTPKG)/spiffs/include
-INCLUDES += -I$(PKGDIRBASE)/spiffs/riotbuild/
+INCLUDES += -I$(PKGDIRBASE)/spiffs/src/
 
 ifneq (,$(filter spiffs_fs,$(USEMODULE)))
   DIRS += $(RIOTBASE)/pkg/spiffs/fs
diff --git a/pkg/spiffs/Makefile.spiffs b/pkg/spiffs/Makefile.spiffs
new file mode 100644
index 0000000000..4e8962d731
--- /dev/null
+++ b/pkg/spiffs/Makefile.spiffs
@@ -0,0 +1,3 @@
+MODULE := spiffs
+
+include $(RIOTBASE)/Makefile.base