Merge remote-tracking branch 'remotes/gh/master'

* remotes/gh/master:
  Bump version; git-ize Release in specfile
  */Makefile.am:  Fix include paths and `distclean`
  libast.spec:  Add %{?dist} tag to Release field
  Fix build on RHEL8

6 files changed, 16 insertions, 10 deletions

diff --git a/Makefile.am b/Makefile.am
index f0bed9b..f5d5ab3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ macrodir = $(datadir)/aclocal
 EXTRA_DIST = DESIGN LICENSE README $(MACROS) libast.spec
 MAINTAINERCLEANFILES = Makefile.in *~ aclocal.m4 config.guess config.sub configure depcomp \
     install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h* *.log config.h.in
+DISTCLEANFILES = Makefile
 
 test: all
 	cd test && $(MAKE) test
diff --git a/configure.ac b/configure.ac
index a42608f..df8625b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,10 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE([libast], [0.8])
+AC_INIT([LibAST], [0.8.1])
+AC_CONFIG_SRCDIR([configure.ac])
+AM_INIT_AUTOMAKE
+
 AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION", [Version])
 AC_CONFIG_MACRO_DIR([.])
 
@@ -39,7 +41,7 @@ AC_CONFIG_FILES([include/libast/types.h Makefile include/Makefile
                  src/Makefile test/Makefile libast-config])
 
 dnl# Set some basic variables
-AUTHORS="Michael Jennings (mej@eterm.org and mej@lbl.gov)"
+AUTHORS="Michael Jennings (mej@eterm.org and mej@lanl.gov)"
 AC_SUBST(AUTHORS)
 AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors])
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 35c8dd8..468c187 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -17,4 +17,4 @@ libast/sysdefs.h: libast/sysdefs.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 MAINTAINERCLEANFILES = Makefile.in
-DISTCLEANFILES = libast/sysdefs.h libast/types.h
+DISTCLEANFILES = Makefile libast/sysdefs.h libast/types.h
diff --git a/libast.spec b/libast.spec
index 901e618..bbd5615 100644
--- a/libast.spec
+++ b/libast.spec
@@ -1,13 +1,14 @@
+%{!?_rel:%{expand:%%global _rel 0.%(git describe --abbrev=4 --always --tags --long --dirty=.1 | cut -d- -f 2- | tr '-' '.')}}
+
 %define __os_install_post /usr/lib/rpm/brp-compress
 %if %{!?optflags:1}0
-%define optflags ${RPM_OPT_FLAGS:--O0 -g3}
+%{expand:%%define optflags %{!?el8:${RPM_OPT_FLAGS:--O0 -g3}}%{?el8:-O2 -ggdb3 -fPIC}}
 %endif
 
 Summary: Library of Assorted Spiffy Things
 Name: libast
-Version: 0.8
-#Release: 1
-Release: 0.%(date '+%Y%m%d')
+Version: 0.8.1
+Release: %{_rel}%{?dist}
 Group: System Environment/Libraries
 License: BSD
 URL: http://www.eterm.org/
diff --git a/src/Makefile.am b/src/Makefile.am
index 52cd549..4db1fb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 lib_LTLIBRARIES = libast.la
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) -I$(top_builddir)/include
+AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_LDFLAGS = $(PTHREAD_LIBS)
 
@@ -13,3 +13,4 @@ snprintf.c tok.c url.c ustr.c
 
 libast_la_LDFLAGS = -version-info 2:2:0
 MAINTAINERCLEANFILES = Makefile.in
+DISTCLEANFILES = Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index 2fcf71d..624083e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_PROGRAMS = libast-test libast-perf
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
+AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
 
 libast_test_SOURCES = test.c test.h
 libast_test_DEPENDENCIES = $(top_builddir)/src/libast.la
@@ -20,3 +20,4 @@ perf: libast-perf
 
 .PHONY: test
 MAINTAINERCLEANFILES = Makefile.in
+DISTCLEANFILES = Makefile