summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/00_build_make_beta.patch34
2 files changed, 37 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c8f37a..13c30af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
gnumach (1:20050801-3) UNRELEASED; urgency=low
+ * Fix build failure with latest make 3.81 beta and the new tab vs. shell
+ POSIX behaviour.
+ Thanks to Alfred M. Szmidt <ams@gnu.org>.
* Added ChangeLog entries.
- debian/patches/13_ide_dma.patch: Modify
- debian/patches/14_alloc_params.patch: Likewise.
diff --git a/debian/patches/00_build_make_beta.patch b/debian/patches/00_build_make_beta.patch
new file mode 100644
index 0000000..df0ad07
--- /dev/null
+++ b/debian/patches/00_build_make_beta.patch
@@ -0,0 +1,34 @@
+#DPATCHLEVEL=0
+
+2006-01-11 Alfred M. Szmidt <ams@gnu.org>
+
+ * Makefile.in (migs_d_SCRIPT): New variable.
+ (%.migs_d): Use it.
+ (migu_d_SCRIPT): New variable.
+ %.migu_d): Use it.
+
+--- Makefile.in 2005-07-25 06:48:20.000000000 +0300
++++ Makefile.in 2006-01-11 23:52:38.000000000 +0200
+@@ -467,13 +467,17 @@
+
+ # Here is how to make those dependency files
+
++migs_d_SCRIPT = 'set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \
++ sed -e \'s/[^:]*:/$(@:.migs_d=_server.c) $@:/\' > $@)'
++
+ %.migs_d: %.srv $(before-compile)
+- (set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \
+- sed -e 's/[^:]*:/$(@:.migs_d=_server.c) $@:/' > $@)
++ $(migs_d_SCRIPT)
++
++migu_d_SCRIPT = 'set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \
++ sed -e \'s/[^:]*:/$(@:.migu_d=_user.c) $@:/\' > $@)'
+
+ %.migu_d: %.cli $(before-compile)
+- (set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \
+- sed -e 's/[^:]*:/$(@:.migu_d=_user.c) $@:/' > $@)
++ $(migu_d_SCRIPT)
+
+ %.migsh_d: %.migs_d
+ sed -e 's/_server\.c /_interface.h /' -e 's/migs_d/migsh_d/' < $< > $@
+