From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 25 Aug 2009 09:50:11 +0000 (+0200)
Subject: Move config/bootsplash -> src/.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2387f1ea7ad375c31dc95554053f084bae4e2bdb;p=ipfire-3.x.git

Move config/bootsplash -> src/.
---

diff --git a/lfs/cdrom b/lfs/cdrom
index ca0433fe7..8e393ed20 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -99,9 +99,9 @@ endif
 	# Install isolinux & configuration
 	cp -vf /usr/share/syslinux/{isolinux.bin,vesamenu.c32} \
 		/usr/lib/memtest86+/memtest.bin \
-		$(DIR_CONF)/bootloader/splash.{jpg,lss} \
-		$(DIR_CONF)/bootloader/*.msg $(CDROM_DIR)/isolinux/
-	$(INSTALL_CONFIG) $(DIR_CONF)/bootloader/installer.conf \
+		$(DIR_SOURCE)/bootloader/splash.{jpg,lss} \
+		$(DIR_SOURCE)/bootloader/*.msg $(CDROM_DIR)/isolinux/
+	$(INSTALL_CONFIG) $(DIR_SOURCE)/bootloader/installer.conf \
 		> $(CDROM_DIR)/isolinux/isolinux.cfg
 
 	# Info file
diff --git a/lfs/grub b/lfs/grub
index 8f10312c1..2da93b454 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -132,7 +132,7 @@ $(OBJECT): $(objects)
 
 	mkdir -vp /boot/grub
 	
-	for i in $(DIR_SRC)/config/bootloader/{grub.conf,splash.xpm.gz}; do \
+	for i in $(DIR_SOURCE)/bootloader/{grub.conf,splash.xpm.gz}; do \
 	    [ -f $$i ] && cp -vf $$i /boot/grub; \
 	done
 
diff --git a/lfs/pxe b/lfs/pxe
index 21e9ff2c9..71039bdc1 100644
--- a/lfs/pxe
+++ b/lfs/pxe
@@ -77,11 +77,11 @@ $(OBJECT): $(objects)
 	cp -vf $(IMAGES_DIR)/initramfs-$(VERSION).img $(CDROM_DIR)/$(SNAME)/initrd0
 	cp -vf /boot/ipfirekernel-$(KVER) $(CDROM_DIR)/$(SNAME)/$(SNAME)0
 	cp -vf /usr/share/syslinux/vesamenu.c32 \
-		$(DIR_CONF)/bootloader/splash.{jpg,lss} \
-		$(DIR_CONF)/bootloader/*.msg $(CDROM_DIR)/$(SNAME)/
+		$(DIR_SOURCE)/bootloader/splash.{jpg,lss} \
+		$(DIR_SOURCE)/bootloader/*.msg $(CDROM_DIR)/$(SNAME)/
 
 	cp -vf /usr/share/syslinux/pxelinux.0 $(CDROM_DIR)/
-	$(INSTALL_CONFIG) $(DIR_CONF)/bootloader/pxe.conf \
+	$(INSTALL_CONFIG) $(DIR_SOURCE)/bootloader/pxe.conf \
 		> $(CDROM_DIR)/pxelinux.cfg/$(SNAME)-pxe-$(VERSION).model
 
 	sed -e "s@splash@$(SNAME)/splash@g" \
diff --git a/config/bootloader/boot.msg b/src/bootloader/boot.msg
similarity index 100%
rename from config/bootloader/boot.msg
rename to src/bootloader/boot.msg
diff --git a/config/bootloader/grub.conf b/src/bootloader/grub.conf
similarity index 100%
rename from config/bootloader/grub.conf
rename to src/bootloader/grub.conf
diff --git a/config/bootloader/installer.conf b/src/bootloader/installer.conf
similarity index 100%
rename from config/bootloader/installer.conf
rename to src/bootloader/installer.conf
diff --git a/config/bootloader/options.msg b/src/bootloader/options.msg
similarity index 100%
rename from config/bootloader/options.msg
rename to src/bootloader/options.msg
diff --git a/config/bootloader/pxe.conf b/src/bootloader/pxe.conf
similarity index 100%
rename from config/bootloader/pxe.conf
rename to src/bootloader/pxe.conf
diff --git a/config/bootloader/splash.jpg b/src/bootloader/splash.jpg
similarity index 100%
rename from config/bootloader/splash.jpg
rename to src/bootloader/splash.jpg
diff --git a/config/bootloader/splash.lss b/src/bootloader/splash.lss
similarity index 100%
rename from config/bootloader/splash.lss
rename to src/bootloader/splash.lss
diff --git a/config/bootloader/splash.xpm.gz b/src/bootloader/splash.xpm.gz
similarity index 100%
rename from config/bootloader/splash.xpm.gz
rename to src/bootloader/splash.xpm.gz