summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--boot/Makefile10
-rw-r--r--libpager/Makefile8
2 files changed, 9 insertions, 9 deletions
diff --git a/boot/Makefile b/boot/Makefile
index 798ae417..2df509ad 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -41,17 +41,17 @@ relink:
boot.o: notify_S.h exec_S.h device_S.h io_S.h
-notify_S.h notifyServer.c: $(headers)/mach/notify.defs
+notify_S.h notifyServer.c: $(includedir)/mach/notify.defs
$(CPP) $(CPPFLAGS) $< | \
$(MIGCOM) -user /dev/null -header /dev/null \
-sheader notify_S.h
-exec_S.h execServer.c: $(headers)/hurd/exec.defs
+exec_S.h execServer.c: $(includedir)/hurd/exec.defs
$(CPP) $(CPPFLAGS) $< -DSERVERPREFIX=S_ | \
$(MIGCOM) -user /dev/null -header /dev/null \
-sheader exec_S.h
-device.defs: $(headers)/device/device.defs
+device.defs: $(includedir)/device/device.defs
sed -e '/out device : device_t/s/device_t/mach_port_send_t/' $< > $@
device_S.h deviceServer.c: device.defs
@@ -59,11 +59,11 @@ device_S.h deviceServer.c: device.defs
$(MIGCOM) -user /dev/null -header /dev/null \
-sheader device_S.h
-device_replyUser.c: $(headers)/device/device_reply.defs
+device_replyUser.c: $(includedir)/device/device_reply.defs
$(CPP) $(CPPFLAGS) $< | \
$(MIGCOM) -server /dev/null
-io.defs: $(headers)/hurd/io.defs mungio
+io.defs: $(includedir)/hurd/io.defs mungio
sed -f mungio $< > $@
io_S.h ioServer.c: io.defs
$(CPP) $(CPPFLAGS) $< | \
diff --git a/libpager/Makefile b/libpager/Makefile
index d3addac2..124455ad 100644
--- a/libpager/Makefile
+++ b/libpager/Makefile
@@ -41,12 +41,12 @@ $(hurdinst)/lib/libpager.a: libpager.a
cp libpager.a $@
$(RANLIB) $@
-$(headers)/hurd/pager.h: pager.h
+$(includedir)/hurd/pager.h: pager.h
cp pager.h $@
-install: $(hurdinst)/lib/libpager.a $(headers)/hurd/pager.h
+install: $(hurdinst)/lib/libpager.a $(includedir)/hurd/pager.h
-$(OBJS): pager.h priv.h $(headers)/hurd/ports.h
+$(OBJS): pager.h priv.h $(includedir)/hurd/ports.h
data-request.o data-return.o data-unlock.o lock-completed.o: memory_object.h
stubs.o object-init.o object-terminate.o: memory_object.h
@@ -56,6 +56,6 @@ clean:
# MiG gook
memory_object.h memory_objectServer.c:
- $(CPP) $(CPPFLAGS) -DSEQNOS $(headers)/mach/memory_object.defs \
+ $(CPP) $(CPPFLAGS) -DSEQNOS $(includedir)/mach/memory_object.defs \
| $(MIGCOM) -prefix _pager_ -sheader memory_object.h \
-header /dev/null -user /dev/null