[X2Go-Commits] [x2go-keyring] 01/02: Makefile: check file size on prerequisite, not the just-generated target file.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2go-keyring.

commit d2d791674c9428a2739e36edab191e1b89ae2e76
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Aug 18 15:08:54 2019 +0200

    Makefile: check file size on prerequisite, not the just-generated target file.
---
 Makefile         | 8 ++++----
 debian/changelog | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index fe12067..399eb2a 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ keyrings/x2go-archive-keyring.gpg: active-keys/index
 
 keyrings/x2go-archive-keyring.gpg1: keyrings/x2go-archive-keyring.gpg
 	touch $@
-	if [ -s $@ ]; then \
+	if [ -s $< ]; then \
 		${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
 	fi
 
@@ -96,7 +96,7 @@ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index
 
 keyrings/x2go-archive-removed-keys.gpg1: keyrings/x2go-archive-removed-keys.gpg
 	touch $@
-	if [ -s $@ ]; then \
+	if [ -s $< ]; then \
 		${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
 	fi
 
@@ -117,7 +117,7 @@ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index
 
 keyrings/x2go-maintainers-keyring.gpg1: keyrings/x2go-maintainers-keyring.gpg
 	touch $@
-	if [ -s $@ ]; then \
+	if [ -s $< ]; then \
 		${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
 	fi
 
@@ -138,7 +138,7 @@ keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index
 
 keyrings/x2go-maintainers-removed-keys.gpg1: keyrings/x2go-maintainers-removed-keys.gpg
 	touch $@
-	if [ -s $@ ]; then \
+	if [ -s $< ]; then \
 		${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
 	fi
 
diff --git a/debian/changelog b/debian/changelog
index af64578..c58271a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,6 +100,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
   * keyrings/: refresh signatures on new-style keyrings.
   * keyrings/: add signatures on old-style keyrings.
   * .gitignore: refresh with old-style and vim backup files.
+  * Makefile: check file size on prerequisite, not the just-generated target
+    file.
   * debian/control:
     - Change maintainer to the mailing list.
     - Add the old package maintainer to the Uploaders field and myself.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git