From 8fd4821155e19f5e659b05a756ac308fc052b323 Mon Sep 17 00:00:00 2001 From: Ambrus Szabo Date: Sat, 26 Mar 2011 22:02:06 +0100 Subject: [PATCH] Fix makefiles bug. FreeBSD make vs gmake in FreeBSD: $(dir $<@) => '' in gmake: $(dir $<@) => './' --- 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 9d6fa914..f04bac04 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -108,13 +108,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)#;' < get-wings-flags.in > $@ + -e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)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)#;' < get-wutil-flags.in > $@ + -e 's#$${INTLIBS}#$(INTLIBS)#;' < $(dir $<@)get-wutil-flags.in > $@ @chmod 755 $@ diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am index 659a9f29..6c6de3d1 100644 --- a/wrlib/Makefile.am +++ b/wrlib/Makefile.am @@ -68,6 +68,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)#;' < get-wraster-flags.in > $@ + -e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)get-wraster-flags.in > $@ @chmod 755 $@