Formerly GNUmakefile.~61~

diff --git a/GNUmakefile b/GNUmakefile
index 47756186c8fa4e9f171373b7ca177729836cfb51..6a557d97056605ecbf8192d12185954d57671f04 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -61,19 +61,14 @@ libc_dir = /home/gd2/gnu/libc/$(ARCH)
 ifneq ($(wildcard $(libc_dir)),)
 ifneq ($(wildcard $(libc_dir)/works-for-make),)
 dash_m := -M
-CPPFLAGS := -I$(libc_dir)/ansi
-LDFLAGS := -nostdlib $(libc_dir)/start.o
-ifeq ($(ARCH),hp300)
-gcc-arch = hp300bsd
-else
-gcc-arch = $(ARCH)
-endif
+CPPFLAGS := -I$(libc_dir)/include
+LDFLAGS := -nostdlib $(libc_dir)/lib/start.o
 LOADLIBES := $(LOADLIBES) \
-            $(libc_dir)/mcheck-init.o \
-            $(libc_dir)/libc.a \
+            $(libc_dir)/lib/mcheck-init.o \
+            $(libc_dir)/lib/libc.a \
             -lgcc \
-            $(libc_dir)/libc.a
-$(prog): $(libc_dir)/libc.a
+            $(libc_dir)/lib/libc.a
+$(prog): $(libc_dir)/lib/libc.a
 
 # glob is in the C library.
 globdep =