diff --git a/repos/dde_rump/lib/mk/rump.inc b/repos/dde_rump/lib/mk/rump.inc index 85f6dcce08..cabd91fb26 100644 --- a/repos/dde_rump/lib/mk/rump.inc +++ b/repos/dde_rump/lib/mk/rump.inc @@ -196,7 +196,8 @@ SRC_NOLINK += accessors.c \ vnode_if.c \ xlat_mbr_fstype.c -INC_DIR += $(RUMP_BASE)/include \ +INC_DIR += $(REP_DIR)/src/include \ + $(RUMP_BASE)/include \ $(RUMP_PORT_DIR)/src/lib/libc/include \ $(RUMP_PORT_DIR)/src/sys/rump/librump/rumpkern/opt \ $(RUMP_PORT_DIR)/src/sys \ diff --git a/repos/dde_rump/lib/mk/vfs_rump.mk b/repos/dde_rump/lib/mk/vfs_rump.mk index 761498c1b3..ff7cbec7a3 100644 --- a/repos/dde_rump/lib/mk/vfs_rump.mk +++ b/repos/dde_rump/lib/mk/vfs_rump.mk @@ -1,6 +1,7 @@ SRC_CC = vfs_rump.cc random.cc LIBS = rump rump_fs INC_DIR += $(REP_DIR)/src/lib/vfs/rump +INC_DIR += $(REP_DIR)/src/include vpath %.cc $(REP_DIR)/src/lib/vfs/rump SHARED_LIB = yes diff --git a/repos/dde_rump/recipes/src/rump/content.mk b/repos/dde_rump/recipes/src/rump/content.mk index 71862d309c..f44d0e323e 100644 --- a/repos/dde_rump/recipes/src/rump/content.mk +++ b/repos/dde_rump/recipes/src/rump/content.mk @@ -14,9 +14,7 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_rump) MIRROR_FROM_REP_DIR := $(LIB_MK) \ lib/import/import-rump.mk \ - src/lib \ - include/rump include/rump_fs \ - include/util + src/lib src/include MIRROR_FROM_PORT_DIR := src/lib/dde_rump/src \ src/lib/libc \ diff --git a/repos/dde_rump/include/rump/env.h b/repos/dde_rump/src/include/rump/env.h similarity index 100% rename from repos/dde_rump/include/rump/env.h rename to repos/dde_rump/src/include/rump/env.h diff --git a/repos/dde_rump/include/rump/timed_semaphore.h b/repos/dde_rump/src/include/rump/timed_semaphore.h similarity index 100% rename from repos/dde_rump/include/rump/timed_semaphore.h rename to repos/dde_rump/src/include/rump/timed_semaphore.h diff --git a/repos/dde_rump/include/rump_fs/fs.h b/repos/dde_rump/src/include/rump_fs/fs.h similarity index 100% rename from repos/dde_rump/include/rump_fs/fs.h rename to repos/dde_rump/src/include/rump_fs/fs.h diff --git a/repos/dde_rump/include/util/allocator_fap.h b/repos/dde_rump/src/include/util/allocator_fap.h similarity index 100% rename from repos/dde_rump/include/util/allocator_fap.h rename to repos/dde_rump/src/include/util/allocator_fap.h diff --git a/repos/dde_rump/include/util/hard_context.h b/repos/dde_rump/src/include/util/hard_context.h similarity index 100% rename from repos/dde_rump/include/util/hard_context.h rename to repos/dde_rump/src/include/util/hard_context.h diff --git a/repos/dde_rump/include/util/random.h b/repos/dde_rump/src/include/util/random.h similarity index 100% rename from repos/dde_rump/include/util/random.h rename to repos/dde_rump/src/include/util/random.h