Merge ~ines-almeida/txpkgupload:remove-git-dependency-from-default-make-command into txpkgupload:master

[Ines Almeida]

Update Makefile default commands to not update version

This command requires a git directory, which doesn't always need to be the case when one runs the default `make` command, e.g., installing it from the tarball. This change moves that command to run when building the tarball, which should be the new way of deploying txpkgupload in the future

Currently there is no good `make` command to run on charm install for txpkgupload.
The `make compile` command will fail and throw an error if not in a .git repository.

Another alternative would be to make it fail gracefully, but IMO it doesn't make much sense to me to need to run the `update-version` script there regardless.

[Colin Watson (cjwatson)]

Looking at https://git.launchpad.net/launchpad/commit?id=e13a516043 as an example, could you instead do `[ ! -d .git ] || scripts/update-version-info.sh`? That should make it work gracefully in a charm, and I think you could probably then drop the change to the `build-tarball` rule.

[Ines Almeida (ines-almeida)]

Sounds good, updated. I'll squash and update the commit message after approved to remove the incoherence

[Colin Watson (cjwatson)]

review: Approve

diff --git a/Makefile b/Makefile
index ddd2107..313b16e 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ default: compile
 
 bootstrap compile:
 	$(MAKE) $(ENV)
-	scripts/update-version-info.sh
+	[ ! -d .git ] || $(MAKE) $(VERSION_INFO)
 
 
 $(VERSION_INFO):