diff options
| author | Oliver Tappe | 2006-09-29 19:25:17 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2006-09-29 19:25:17 +0200 |
| commit | d12a5655d62d5e66afc706d67c109d1dc9d082fd (patch) | |
| tree | cf1a48d03a35e04d2aa426c31d3b8c4244fde272 /Makefile | |
| parent | * hopefully cleared up issue with tftpboot-prefix, as we expect the tftp-server (diff) | |
| download | core-d12a5655d62d5e66afc706d67c109d1dc9d082fd.tar.gz core-d12a5655d62d5e66afc706d67c109d1dc9d082fd.tar.xz core-d12a5655d62d5e66afc706d67c109d1dc9d082fd.zip | |
* added SLX_EXPORT_PATH
* changed order of env-vars to reflect dependency, not alphabetical order
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@412 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -13,32 +13,39 @@ ifeq ($(USR_BIN_PATH),) USR_BIN_PATH = /usr/bin endif + +ifeq ($(SLX_CONFIG_PATH),) + SLX_CONFIG_PATH = /etc/opt/openslx +endif ifeq ($(SLX_BASE_PATH),) SLX_BASE_PATH = /opt/openslx endif ifeq ($(SLX_BIN_PATH),) SLX_BIN_PATH = ${SLX_BASE_PATH}/bin endif -ifeq ($(SLX_CONFIG_PATH),) - SLX_CONFIG_PATH = /etc/opt/openslx +ifeq ($(SLX_SHARE_PATH),) + SLX_SHARE_PATH = ${SLX_BASE_PATH}/share +endif +ifeq ($(SLX_VMWARE_PATH),) + SLX_VMWARE_PATH = ${SLX_BASE_PATH}/vmware endif + ifeq ($(SLX_PRIVATE_PATH),) SLX_PRIVATE_PATH = /var/opt/openslx endif + ifeq ($(SLX_PUBLIC_PATH),) SLX_PUBLIC_PATH = /srv/openslx endif -ifeq ($(SLX_SHARE_PATH),) - SLX_SHARE_PATH = ${SLX_BASE_PATH}/share -endif -ifeq ($(SLX_TEMP_PATH),) - SLX_TEMP_PATH = /tmp +ifeq ($(SLX_EXPORT_PATH),) + SLX_EXPORT_PATH = ${SLX_PUBLIC_PATH}/export endif ifeq ($(SLX_TFTPBOOT_PATH),) SLX_TFTPBOOT_PATH = ${SLX_PUBLIC_PATH}/tftpboot endif -ifeq ($(SLX_VMWARE_PATH),) - SLX_VMWARE_PATH = ${SLX_BASE_PATH}/vmware + +ifeq ($(SLX_TEMP_PATH),) + SLX_TEMP_PATH = /tmp endif tarball: @@ -114,6 +121,7 @@ functions via\n# inclusion: '. /etc/functions' ..." \ \nSLX_BASE_PATH=${SLX_BASE_PATH}\ \nSLX_BIN_PATH=${SLX_BIN_PATH}\ \nSLX_CONFIG_PATH=${SLX_CONFIG_PATH}\ +\nSLX_EXPORT_PATH=${SLX_EXPORT_PATH}\ \nSLX_PRIVATE_PATH=${SLX_PRIVATE_PATH}\ \nSLX_PUBLIC_PATH=${SLX_PUBLIC_PATH}\ \nSLX_SHARE_PATH=${SLX_SHARE_PATH}\ |