Skip to content

Commit 9646cc0

Browse files
committed
Fix around depend files
1 parent d099c8d commit 9646cc0

4 files changed

Lines changed: 187 additions & 179 deletions

File tree

common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22291,4 +22291,4 @@ zjit.$(OBJEXT): {$(VPATH)}zjit.h
2229122291
zjit.$(OBJEXT): {$(VPATH)}zjit.rbinc
2229222292
# AUTOGENERATED DEPENDENCIES END
2229322293

22294-
!include ext/pathname/depend
22294+
!include $(srcdir)/ext/pathname/depend

configure.ac

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4658,6 +4658,9 @@ AS_IF([test ! -f "$srcdir/revision.h"], [
46584658
])
46594659
])
46604660

4661+
depends=`sed -n 's/^!include //p' ${srcdir}/common.mk`
4662+
AC_SUBST(depends)
4663+
46614664
AS_IF([test x"$firstmf" != x], [
46624665
AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
46634666
])
@@ -4685,10 +4688,9 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
46854688
done
46864689
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
46874690
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
4688-
depends=`grep '^!include' ${srcdir}/common.mk | sed 's:^.* :$(srcdir)/:'`
46894691
AS_IF([test "$gnumake" != yes], [
4690-
echo ['$(MKFILES): $(srcdir)/common.mk'${depends:+" $depends"}]
4691-
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk `echo "$depends" | sed 's|\$(srcdir)|'"$(srcdir)|g"`
4692+
echo ['$(MKFILES): $(srcdir)/common.mk']
4693+
sed ['s/{\$([^(){}]*)[^{}]*}//g;/^!include /d'] ${srcdir}/common.mk `echo "$depends" | sed 's|\$(srcdir)|'"${srcdir}|g"`
46924694
AS_IF([test "$YJIT_SUPPORT" = yes], [
46934695
cat ${srcdir}/yjit/not_gmake.mk
46944696
echo ['$(MKFILES): ${srcdir}/yjit/not_gmake.mk']

0 commit comments

Comments
 (0)