Bump dxcommon to pull in build portability improvements.

[gob-dx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 84a4d9560fb7e97b3335d4f5e9a2d26ed2e30e55..6422661b0af27a662b706b8440d00107efbcf5f6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,12 +130,17 @@ uninstall-gob2-html:
 m4dir = $(datadir)/aclocal
 m4_DATA = gob2.m4
 
-gob2.m4: $(top_srcdir)/common/m4/gob2.m4
-       $(AM_V_GEN) $(SED) 's/DX_PROG_GOB2/GOB2_CHECK/g' \
-         $(top_srcdir)/common/m4/gob2.m4 >$@.tmp
+gob2.m4: $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
+       $(AM_V_GEN) :; { \
+         $(SED) -e 's/DX_PROG_GOB2/GOB2_CHECK/g' \
+                -e 's/DX_BASENAME/GOB2_BASENAME/g' \
+                $(DX_BASEDIR)/m4/gob2.m4 && echo && \
+         $(SED) -e 's/DX_/GOB2_/g' -e 's/dx_fn_/gob2_fn_/g' \
+                $(DX_BASEDIR)/m4/basename.m4; \
+       } >$@.tmp
        $(AM_V_at) mv -f $@.tmp $@
 DISTCLEANFILES += gob2.m4
-EXTRA_DIST += common/m4/gob2.m4
+EXTRA_DIST += $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
 
 git_changelog_start = 2cd951c678998b2b0230c8eb25717ecf0f1dd2db
 dist-hook: generate-changelog