chagne system structure and fix env

1 files changed, 5 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index f2b7736..40373a4 100644
--- a/Makefile
+++ b/Makefile
@@ -34,12 +34,12 @@ target:
 
 initramfs: target core smash
 	@echo Installing Initramfs
-	@mkdir -p ${INITRAMFS}/bin ${INITRAMFS}/etc ${INITRAMFS}/shr/man
+	@mkdir -p ${INITRAMFS}/bin ${INITRAMFS}/system/config ${INITRAMFS}/system/manual
 	@cp core/objects/* ${INITRAMFS}/bin/
-	@cp man/* ${INITRAMFS}/shr/man/
+	@cp man/* ${INITRAMFS}/system/manual/
 	@cp smash/smash ${INITRAMFS}/bin/
 	@cp utils/* ${INITRAMFS}/bin/
-	@cp etc/* ${INITRAMFS}/etc/
+	@cp config/* ${INITRAMFS}/system/config
 	@mv ${INITRAMFS}/bin/init ${INITRAMFS}/init
 	@echo Building Initramfs
 	@cd ${INITRAMFS} && find . | cpio -o --quiet --format=newc > ../initramfs.img
@@ -50,7 +50,7 @@ ${TARGET}/kernel:
 	@echo Extracting Kernel
 	@tar -xf ${TARGET}/kernel.tar.gz
 	@mv linux-${KERNEL_VERSION} ${TARGET}/kernel-src
-	@cp config/linux.config ${TARGET}/kernel-src/.config
+	@cp build_config/linux.config ${TARGET}/kernel-src/.config
 	@echo Building Kernel
 	@$(MAKE) -C ${TARGET}/kernel-src > /dev/null
 	@cp ${TARGET}/kernel-src/arch/x86_64/boot/bzImage ${TARGET}/kernel
@@ -68,7 +68,7 @@ rootfs: target initramfs ${TARGET}/syslinux ${TARGET}/kernel
 	@mkdir -p ${ROOTFS}/syslinux ${ROOTFS}/images/rex/
 	@cp ${TARGET}/initramfs.img ${ROOTFS}/images/rex/boot.img
 	@cp ${TARGET}/kernel ${ROOTFS}/images/rex/kernel
-	@cp config/syslinux.cfg ${ROOTFS}/syslinux/syslinux.cfg
+	@cp build_config/syslinux.cfg ${ROOTFS}/syslinux/syslinux.cfg
 	@cp ${TARGET}/syslinux/bios/core/isolinux.bin \
 	         ${TARGET}/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32 \
 	         ${TARGET}/syslinux/bios/com32/libutil/libutil.c32 \