>From 049071e2013b6f11b74b3b0055bf018e1efdbf8d Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <[email protected]>
Date: Sun, 29 Apr 2012 13:42:30 +0200
Subject: [PATCH 1/3] 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 2295718..0c8f57f 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 8dec1f6..b191158 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 $@
--
1.7.6
--
To unsubscribe, send mail to [email protected].
