From 07ac7e3d34fa61b62b34fd87000b1484e508cc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20M=C3=BCller?= <reinhard@fsfe.org>
Date: Mon, 11 Mar 2019 22:49:38 +0100
Subject: [PATCH] Remove a few files from target directory output

---
 about/.directory            |  2 --
 about/albers/svn-commit.tmp |  4 ----
 build/makerules.sh          | 19 ++++++++++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 about/.directory
 delete mode 100644 about/albers/svn-commit.tmp

diff --git a/about/.directory b/about/.directory
deleted file mode 100644
index 8ba0862d6a..0000000000
--- a/about/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2011,2,17,20,27,36
diff --git a/about/albers/svn-commit.tmp b/about/albers/svn-commit.tmp
deleted file mode 100644
index 31de5afa1d..0000000000
--- a/about/albers/svn-commit.tmp
+++ /dev/null
@@ -1,4 +0,0 @@
-update me
---This line, and those below, will be ignored--
-
-M    albers.en.xhtml
diff --git a/build/makerules.sh b/build/makerules.sh
index 5c8ba670b2..6903109a38 100755
--- a/build/makerules.sh
+++ b/build/makerules.sh
@@ -210,10 +210,23 @@ EOF
 # -----------------------------------------------------------------------------
 
 # All files which should just be copied over
-COPY_SRC_FILES := \$(shell find \$(INPUTDIR) -type f -not -path '\$(INPUTDIR)/.git/*' -not -name 'Makefile' -not -name '*.sources' -not -name "*.xmllist" -not -name '*.xhtml' -not -name '*.xml' -not -name '*.xsl')
+COPY_SRC_FILES := \$(shell find \$(INPUTDIR) -type f \
+  -not -path '\$(INPUTDIR)/.git/*' \
+  -not -path '\$(INPUTDIR)/build/*' \
+  -not -path '\$(INPUTDIR)/tools/*' \
+  -not -name '.drone.yml' \
+  -not -name '.gitignore' \
+  -not -name 'README*' \
+  -not -name 'Makefile' \
+  -not -name '*.sources' \
+  -not -name "*.xmllist" \
+  -not -name '*.xhtml' \
+  -not -name '*.xml' \
+  -not -name '*.xsl' \
+)
 
 # The same as above, but moved to the output directory
-COPY_DST_FILES := \$(patsubst \$(INPUTDIR)/%,\$(OUTPUTDIR)/%,\$(COPY_SRC_FILES))
+COPY_DST_FILES := \$(sort \$(patsubst \$(INPUTDIR)/%,\$(OUTPUTDIR)/%,\$(COPY_SRC_FILES)))
 
 all: \$(COPY_DST_FILES)
 \$(COPY_DST_FILES): \$(OUTPUTDIR)/%: \$(INPUTDIR)/%
@@ -224,7 +237,7 @@ all: \$(COPY_DST_FILES)
 # Copy .xhtml files to "source" directory in target directory tree
 # -----------------------------------------------------------------------------
 
-SOURCE_DST_FILES := \$(patsubst \$(INPUTDIR)/%,\$(OUTPUTDIR)/source/%,\$(HTML_SRC_FILES))
+SOURCE_DST_FILES := \$(sort \$(patsubst \$(INPUTDIR)/%,\$(OUTPUTDIR)/source/%,\$(HTML_SRC_FILES)))
 
 all: \$(SOURCE_DST_FILES)
 \$(SOURCE_DST_FILES): \$(OUTPUTDIR)/source/%: \$(INPUTDIR)/%