From f25464c79226fc5b9f32f9c3e1836c6650e8623e Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Sun, 29 Apr 2012 13:42:30 +0200 Subject: [PATCH] Avoid GNUism in Makefiles for *BSD support Variable abs_srcdir will always point to proper source location. With this patch, there is no need to call gmake on OpenBSD anymore. --- WINGs/Makefile.am | 4 ++-- wrlib/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index 2295718a..0c8f57f4 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -111,13 +111,13 @@ get-wings-flags: get-wings-flags.in Makefile -e 's#$${GFXLIBS}#$(GFXLIBS)#;' \ -e 's#$${XFTLIBS}#$(XFTLIBS)#;' \ -e 's#$${INTLIBS}#$(INTLIBS)#;' \ - -e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)get-wings-flags.in > $@ + -e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wings-flags.in > $@ @chmod 755 $@ get-wutil-flags: get-wutil-flags.in Makefile @echo "Generating $@" @$(SED) -e 's#$${includedir}#$(includedir)#;' \ -e 's#$${libdir}#$(libdir)#;' \ - -e 's#$${INTLIBS}#$(INTLIBS)#;' < $(dir $<@)get-wutil-flags.in > $@ + -e 's#$${INTLIBS}#$(INTLIBS)#;' < $(abs_srcdir)/get-wutil-flags.in > $@ @chmod 755 $@ diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am index 8dec1f65..b1911585 100644 --- a/wrlib/Makefile.am +++ b/wrlib/Makefile.am @@ -69,6 +69,6 @@ get-wraster-flags: get-wraster-flags.in Makefile @$(SED) -e 's#$${inc_search_path}#$(inc_search_path)#;' \ -e 's#$${lib_search_path}#$(lib_search_path)#;' \ -e 's#$${GFXLIBS}#$(GFXLIBS)#;' \ - -e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)get-wraster-flags.in > $@ + -e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wraster-flags.in > $@ @chmod 755 $@ -- 2.11.4.GIT