From 5b33bd5edacd59d68baab3ab5efdfe870807fde9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 31 Mar 2017 17:50:34 -0600 Subject: [PATCH] fix: clean up src files in tmp build dir --- deb.mk | 4 ++++ rpm.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/deb.mk b/deb.mk index 2a8e8c055..ba8d61ea8 100644 --- a/deb.mk +++ b/deb.mk @@ -124,8 +124,12 @@ deb-dokku: cp dokku /tmp/build/usr/bin cp LICENSE /tmp/build/usr/share/doc/dokku/copyright find . -name ".DS_Store" -depth -exec rm {} \; + $(MAKE) go-build + cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available + find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done + rm /tmp/build/var/lib/dokku/core-plugins/common.mk $(MAKE) help2man $(MAKE) addman cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1 diff --git a/rpm.mk b/rpm.mk index 9bbc9267f..55702f2b9 100644 --- a/rpm.mk +++ b/rpm.mk @@ -58,8 +58,12 @@ rpm-dokku: cp dokku /tmp/build/usr/bin cp LICENSE /tmp/build/usr/share/doc/dokku/copyright find . -name ".DS_Store" -depth -exec rm {} \; + $(MAKE) go-build + cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available + find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done + rm /tmp/build/var/lib/dokku/core-plugins/common.mk $(MAKE) help2man $(MAKE) addman cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1