diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2025-02-04 23:30:02 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2025-02-04 23:30:02 +0100 |
| commit | 71d7945e298bc4077d4817eccd6c5cd7656942a2 (patch) | |
| tree | f1be45be48332294b7e56b50d02d8538a07b6021 | |
| parent | 57facae9c1b4799224ff7e41af167f791749d102 (diff) | |
| download | gnumach-71d7945e298bc4077d4817eccd6c5cd7656942a2.tar.gz gnumach-71d7945e298bc4077d4817eccd6c5cd7656942a2.tar.bz2 gnumach-71d7945e298bc4077d4817eccd6c5cd7656942a2.zip | |
Fix build against automake 1.17
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.in.dep.2.patch | 19 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 24 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 837d602e..6f21e55e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -209,6 +209,7 @@ exec_boot_PROGRAMS = \ EXTRA_DIST += \ config.status.dep.patch \ + Makefile.in.dep.2.patch \ Makefile.in.dep.patch EXTRA_DIST += \ diff --git a/Makefile.in.dep.2.patch b/Makefile.in.dep.2.patch new file mode 100644 index 00000000..70c0acaa --- /dev/null +++ b/Makefile.in.dep.2.patch @@ -0,0 +1,19 @@ +--- Makefile.in ++++ Makefile.in +@@ -4785,7 +4785,15 @@ distclean-compile: + + $(am__depfiles_remade): + @$(MKDIR_P) $(@D) +- @: >>$@ ++ # Ugly bootstrap hack to get to-be-generated files created ++ # Try to guess what file this dependency file is from... ++ @f=$(srcdir)/`dirname "$(@D)"`/`basename "$@" .Po | sed s/lib[^-]\*-//` ; \ ++ for f in "$$f"*; do \ ++ case $$f in \ ++ *.c | *.S) echo "$$f"': $$(filter-out $$(DIST_SOURCES),$$(SOURCES))' ;; \ ++ *) echo '# dummy';; \ ++ esac ; \ ++ done >>$@ + + am--depfiles: $(am__depfiles_remade) + diff --git a/configure.ac b/configure.ac index 88f4d9a1..c3d5ffaa 100644 --- a/configure.ac +++ b/configure.ac @@ -261,8 +261,10 @@ dnl config.status dnl ]) AC_CONFIG_COMMANDS_POST([ if "$PATCH" -f < "$srcdir"/config.status.dep.patch > /dev/null 2>&1 || - ( cd "$srcdir" && "$PATCH" -f < Makefile.in.dep.patch || - grep "Ugly bootstrap hack to get to-be-generated files created" Makefile.in ) > /dev/null 2>&1 + ( cd "$srcdir" && + ( "$PATCH" -f < Makefile.in.dep.patch || + "$PATCH" -f < Makefile.in.dep.2.patch || + grep "Ugly bootstrap hack to get to-be-generated files created" Makefile.in ) ) > /dev/null 2>&1 then] AC_MSG_NOTICE([Applied a patch to work around a deficiency in] [Automake. See `configure.ac' for details.]) [else] AC_MSG_ERROR([failed to patch using `config.status.dep.patch'.] |