From 93ff8e054c6edfe0bf0e8d518c97046eb69c1cc2 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 1 Oct 2006 19:57:23 +0000
Subject: * slightly changed and actived Dirk's changes from revision 419:   it
 is now possible to switch between absolute/relative paths for tftp accesses  
 via the new environment variable SLX_USE_ABSOLUTE_TFTP_PATH (which defaults  
 to 1).

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@421 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ed0ca02a..2fa9985b 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ endif
 ifeq ($(SLX_TFTPBOOT_PATH),)
 	SLX_TFTPBOOT_PATH = ${SLX_PUBLIC_PATH}/tftpboot
 endif
+ifeq ($(SLX_USE_ABSOLUTE_TFTP_PATH),)
+	SLX_USE_ABSOLUTE_TFTP_PATH = 1
+endif
 
 ifeq ($(SLX_TEMP_PATH),)
 	SLX_TEMP_PATH = /tmp
@@ -93,10 +96,10 @@ install:
 	       -p $(SLX_TFTPBOOT_PATH) \
 	       -p $(SLX_SHARE_PATH)/themes
 	@cp initramfs/{mkdxsinitrd,slxmkramfs} $(SLX_BIN_PATH)
-	# sed -e "s,@@@SLX_TFTPBOOT_PATH@@@,$(SLX_TFTPBOOT_PATH)" \
-	#  -i $(SLX_BIN_PATH)/mkdxsinitrd
-	# sed -e "s,@@@SLX_TFTPBOOT_PATH@@@,$(SLX_TFTPBOOT_PATH)" \
-	#  -i $(SLX_BIN_PATH)/slxmkramfs  
+	@sed -e "s,@@@SLX_CONFIG_PATH@@@,$(SLX_CONFIG_PATH)," \
+	  -i $(SLX_BIN_PATH)/mkdxsinitrd
+	@sed -e "s,@@@SLX_CONFIG_PATH@@@,$(SLX_CONFIG_PATH)," \
+	  -i $(SLX_BIN_PATH)/slxmkramfs
 	@chmod u+x $(SLX_BIN_PATH)/{mkdxsinitrd,slxmkramfs}
 	@ln -sf $(SLX_BIN_PATH)/mkdxsinitrd $(USR_BIN)/
 	@ln -sf $(SLX_BIN_PATH)/slxmkramfs $(USR_BIN)/
@@ -131,6 +134,7 @@ functions via\n# inclusion: '. /etc/functions' ..." \
 \nSLX_SHARE_PATH=${SLX_SHARE_PATH}\
 \nSLX_TEMP_PATH=${SLX_TEMP_PATH}\
 \nSLX_TFTPBOOT_PATH=${SLX_TFTPBOOT_PATH}\
+\nSLX_USE_ABSOLUTE_TFTP_PATH=${SLX_USE_ABSOLUTE_TFTP_PATH}\
 \nSLX_VMWARE_PATH=${SLX_VMWARE_PATH}\n" \
 	  > $(SLX_CONFIG_PATH)/settings.default
 	@echo -e "# local setup for openslx (overrides settings.default)\n" \
-- 
cgit v1.2.3-55-g7522