summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2002-05-23 21:44:51 +0000
committerMarcus Brinkmann <marcus@gnu.org>2002-05-23 21:44:51 +0000
commitb7f63dd9b74db05f8174aa71f1e37a2d95969a61 (patch)
treea21f56e460e4609f1ba395dfe71f3fe2b596ca66
parentecc17687614c8502a055166758758942622814c9 (diff)
2002-05-23 Marcus Brinkmann <marcus@gnu.org>
* Makefile: Fix last change properly, by relaxing the rule again and adding our source dir before the exec dir.
-rw-r--r--serverboot/ChangeLog5
-rw-r--r--serverboot/Makefile5
2 files changed, 6 insertions, 4 deletions
diff --git a/serverboot/ChangeLog b/serverboot/ChangeLog
index 9acad23e..1013cf83 100644
--- a/serverboot/ChangeLog
+++ b/serverboot/ChangeLog
@@ -1,5 +1,10 @@
2002-05-23 Marcus Brinkmann <marcus@gnu.org>
+ * Makefile: Fix last change properly, by relaxing the rule again
+ and adding our source dir before the exec dir.
+
+2002-05-23 Marcus Brinkmann <marcus@gnu.org>
+
* Makefile: Fix last change, constraining vpath even further.
2002-05-20 Ognyan Kulev <ogi@fmi.uni-sofia.bg>
diff --git a/serverboot/Makefile b/serverboot/Makefile
index 454b228f..653d5963 100644
--- a/serverboot/Makefile
+++ b/serverboot/Makefile
@@ -41,10 +41,7 @@ vpath boot_script.c $(srcdir)/../boot
vpath userland-boot.c $(srcdir)/../boot
# Look for zip stuff
-vpath unzip.c $(srcdir)/../exec
-vpath inflate.c $(srcdir)/../exec
-vpath util.c $(srcdir)/../exec
-vpath do-bunzip2.c $(srcdir)/../exec
+vpath %.c $(srcdir) $(srcdir)/../exec
# If SMALL_BZIP2 is defined, use relatively small memory.
# It's crucial for serverboot, because swap is not enabled yet.