3 files changed, 7 insertions, 26 deletions
diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local
index 44f70ab8..fb8e6ae6 100644
--- a/dde_pcnet32/Makeconf.local
+++ b/dde_pcnet32/Makeconf.local
@@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2
 ARCH = x86
 SYSTEM = x86-l4v2
 
-BUILDDIR       ?=
+BUILDDIR       ?= ..
 
-libmachdev_path := ../libmachdev/libmachdev.a
-has_libmachdev := $(wildcard $(libmachdev_path))
-ifeq ($(strip $(has_libmachdev)),)
-  libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
-endif
-
-libddekit_path := ../libddekit/libddekit.a
-has_libddekit := $(wildcard $(libddekit_path))
-ifeq ($(strip $(has_libddekit)),)
-  libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
-endif
-
-libslab_path := ../libhurd-slab/libhurd-slab.a
-has_libslab := $(wildcard $(libslab_path))
-ifeq ($(strip $(has_libslab)),)
-  libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
-endif
-
-libbpf_path := ../libbpf/libbpf.a
-has_libbpf := $(wildcard $(libbpf_path))
-ifeq ($(strip $(has_libbpf)),)
-  libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
-endif
+libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a
+libddekit_path := $(BUILDDIR)/libddekit/libddekit.a
+libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a
+libbpf_path := $(BUILDDIR)/libbpf/libbpf.a
 
 DDEKITLIBDIR = $(PKGDIR)/../libddekit/
 DDEKITINCDIR = $(PKGDIR)/../libddekit/include
diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile
index 5b45cc14..18cd336c 100644
--- a/dde_pcnet32/Makefile
+++ b/dde_pcnet32/Makefile
@@ -8,7 +8,7 @@ TARGET         = dde_pcnet32
 SRC_C          = main.c pcnet32.c
 
 LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
 
 # DDE configuration
 include $(L4DIR)/Makeconf
diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c
index 63ab182f..98f4452a 100644
--- a/dde_pcnet32/main.c
+++ b/dde_pcnet32/main.c
@@ -6,7 +6,7 @@
 #include <linux/init.h>  // initcall()
 #include <linux/delay.h> // msleep()
 
-#include <machdev.h>
+#include <hurd/machdev.h>
 
 int using_std = 1;