summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorOliver Tappe2006-10-02 19:47:50 +0200
committerOliver Tappe2006-10-02 19:47:50 +0200
commite4ccccbe97646ee04d469a0c45607ec2e9a0e137 (patch)
tree59181f45580c16d45d3f9808e63711f8674fc1ea /Makefile
parent* major cleanup, added comments and replaced cp -a by tar in order to avoid c... (diff)
downloadcore-e4ccccbe97646ee04d469a0c45607ec2e9a0e137.tar.gz
core-e4ccccbe97646ee04d469a0c45607ec2e9a0e137.tar.xz
core-e4ccccbe97646ee04d469a0c45607ec2e9a0e137.zip
* removed SLX_USE_ABSOLUTE_TFTP_PATH again, as this will be handled by slxsetup.pl (once
that is implemented). After all, that option concerns the local setup, not the deployment configuration (which is the only thing dealt with in the Makefile). git-svn-id: http://svn.openslx.org/svn/openslx/trunk@428 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 3103797a..36945946 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,6 @@ 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
@@ -147,7 +144,6 @@ 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" \