Correct a hacky and incorrect kludge so that the Makefile works on Linux and FreeBSD.

diff --git a/Makefile.am b/Makefile.am
index 0d3ec66f72c37050a8ed7c8b618a7a9b2477d8b9..bc1393d40588d40e588f852cd7d627377b4f5054 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,15 +32,15 @@ if BUILD_FOR_OPENBSD
   AM_CXXFLAGS = -I/usr/local/include -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
   AM_CFLAGS = -Wno-multichar -Wall -Wextra -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
 else
-  AM_CXXFLAGS = -fno-common -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
-  AM_CFLAGS = -fno-common -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
+  AM_CXXFLAGS = -I$(srcdir) -fno-common -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
+  AM_CFLAGS = -I$(srcdir) -fno-common -Wno-multichar -Wall -Wextra -Wno-clobbered -Wno-psabi -pthread -DSYSCONFDIR=\"$(sysconfdir)\"
 endif
 endif
 endif
 
 # include information generated by 'git describe --tags --dirty' if requested
 if USE_GIT_VERSION
-$(top_srcdir)/common.c: gitversion.h
+common.c: gitversion.h
 gitversion.h: .git/index
        printf "// Do not edit!\n" > gitversion.h
        printf "// This file is automatically generated by 'git describe --tags --dirty', if available.\n" >> gitversion.h