From: Daniel Elstner <redacted>
Date: Mon, 9 Nov 2015 10:51:26 +0000 (+0100)
Subject: build: Simplify dist-changelog target
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.3~6
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0dc651eba4b01c936bac3380ae11deed34d082e3;p=sigrok-firmware-fx2lafw.git

build: Simplify dist-changelog target

When not building from git, it is not necessary to manually copy
the ChangeLog file from the source directory to the distribution,
since Automake already does that for us.
---

diff --git a/Makefile.am b/Makefile.am
index 19f4388e..733b81c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -232,13 +232,11 @@ mostlyclean-local:
 dist-hook: dist-changelog
 
 dist-changelog:
-	$(AM_V_at)if test ! -d '$(top_srcdir)/.git'; then \
-		cp -f '$(top_srcdir)/ChangeLog' "$(top_distdir)/ChangeLog"; \
-	elif git -C '$(top_srcdir)' log >.ChangeLog.tmp; then \
-		mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
-	else \
-		rm -f .ChangeLog.tmp; exit 1; \
-	fi
+	$(AM_V_at)if test -d '$(top_srcdir)/.git'; then \
+		if git -C '$(top_srcdir)' log >.ChangeLog.tmp; \
+		then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
+		else rm -f .ChangeLog.tmp; exit 1; fi; \
+	else :; fi
 
 # Creates a convenience tarball with just the generated *.fw files, so that
 # the users don't have to build them manually.