Skip to content

Commit

Permalink
Find ChangeLog if we're using another build directory so we don't
Browse files Browse the repository at this point in the history
end up calling git2cl if we don't need to.

We need to pass -W-no-portability to automake; apparently too much
fancy GNU make stuff is being used now.
  • Loading branch information
d-torrance committed May 5, 2020
1 parent 214b567 commit 2233954
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ dist_desktop_DATA = wmforecast.desktop
EXTRA_DIST = autogen.sh README.md wmforecast.1.in ChangeLog NEWS.md

CLEANFILES = wmforecast.1
MAINTAINERCLEANFILES = ChangeLog
MAINTAINERCLEANFILES = $(srcdir)/ChangeLog

wmforecast.1: wmforecast.1.in ChangeLog
$(eval DATE = $(shell head -n 1 ChangeLog | cut -d' ' -f1 | \
wmforecast.1: wmforecast.1.in $(srcdir)/ChangeLog
$(eval DATE = $(shell head -n 1 $(word 2,$^) | cut -d' ' -f1 | \
tr -d '\n'))
sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' -e 's|@DATE[@]|$(DATE)|g' \
-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' $< > $@

ChangeLog:
$(srcdir)/ChangeLog:
git2cl > $@
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AC_INIT([wmforecast], [1.1], [https://github.com/d-torrance/wmforecast/issues],
[wmforecast], [http://wmforecast.friedcheese.org])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_HEADER([config.h])
AC_PROG_CC
Expand Down

0 comments on commit 2233954

Please sign in to comment.