diff options
| author | Daniel Roethlisberger <[email protected]> | 2018-04-15 21:01:53 +0200 |
|---|---|---|
| committer | Daniel Roethlisberger <[email protected]> | 2018-04-15 21:01:53 +0200 |
| commit | b2fefd618da7e0f98cad3e670bddf89081ecbc4c (patch) | |
| tree | 5628a27317f0e7c60e7cfb77dd63b2f86d0c4006 | |
| parent | 8e3ea80af18da4ff51e61646513d5bfc637a9401 (diff) | |
Fix makefile bugs introduced in earlier changes
| -rw-r--r-- | GNUmakefile | 3 | ||||
| -rw-r--r-- | Mk/buildinfo.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index a7069ea..b20b7e5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -353,7 +353,7 @@ export WGET ifndef MAKE_RESTARTS $(info ------------------------------------------------------------------------------) -$(info $(PNAME) $(VERSION)) +$(info $(PKGLABEL) $(VERSION)) $(info ------------------------------------------------------------------------------) $(info Report bugs at https://github.com/droe/sslsplit/issues/new) $(info Please supply this header for diagnostics when reporting build issues) @@ -371,6 +371,7 @@ ifdef CHECK_FOUND $(info CHECK_BASE: $(strip $(CHECK_FOUND))) endif $(info Build options: $(FEATURES)) +$(info Build info: $(BUILD_INFO)) ifeq ($(shell uname),Darwin) $(info OSX_VERSION: $(OSX_VERSION)) $(info XNU_VERSION: $(XNU_VERSION) ($(XNU_METHOD), have $(XNU_HAVE))) diff --git a/Mk/buildinfo.mk b/Mk/buildinfo.mk index 4f9a7d2..bda766a 100644 --- a/Mk/buildinfo.mk +++ b/Mk/buildinfo.mk @@ -20,7 +20,6 @@ NEWS_FILE:= $(firstword $(wildcard NEWS*)) ifdef GITDIR BUILD_VERSION:= $(shell $(GIT) describe --tags --dirty --always) BUILD_INFO+= V:GIT -GITDIR:= else ifdef VERSION_FILE BUILD_VERSION:= $(shell $(CAT) VERSION) @@ -48,6 +47,7 @@ BUILD_CPPFLAGS+=-D"BUILD_PKGNAME=\"$(PKGNAME)\"" \ # out: NEWS_FILE # out: NEWS_SHA # out: VERSION_FILE +# out: GITDIR # out: BUILD_VERSION # out: BUILD_DATE # out: BUILD_INFO |