diff options
| author | Oliver Tappe | 2007-05-28 23:53:13 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-05-28 23:53:13 +0200 |
| commit | 186cc89e440017fc49907929105e0eb7ed31eaa9 (patch) | |
| tree | 18040459f9bf1f85991673b4817384c8fb17aa85 /Makefile | |
| parent | * added support for 'local:'-URLs, which trigger the automatic start of a (diff) | |
| download | core-186cc89e440017fc49907929105e0eb7ed31eaa9.tar.gz core-186cc89e440017fc49907929105e0eb7ed31eaa9.tar.xz core-186cc89e440017fc49907929105e0eb7ed31eaa9.zip | |
* part one of settings file related changes (ticket#122):
- 'settings.default' now lives in /opt/openslx/share
- 'settings.local' has been renamed to 'settings'
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1103 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -125,9 +125,9 @@ install: @ # specific database modules are optional, but we tell the user if @ # support for a database is missing: @DEFAULT_DB_TYPE=""; \ - if test -e ${SLX_CONFIG_PATH}/settings.local; then \ + if test -e ${SLX_CONFIG_PATH}/settings; then \ echo "Reading local settings..."; \ - . ${SLX_CONFIG_PATH}/settings.local; \ + . ${SLX_CONFIG_PATH}/settings; \ fi; \ for m in $${SLX_DB_TYPE} SQLite CSV mysql; do \ if ! perl -Ilib -Iconfig-db -e "use OpenSLX::MetaDB::$$m" 2>>${SLX_INSTALL_LOG} ; then \ @@ -234,10 +234,12 @@ functions via\n# inclusion: '. /etc/functions' ..." \ \nSLX_TEMP_PATH=${SLX_TEMP_PATH}\ \nSLX_TFTPBOOT_PATH=${SLX_TFTPBOOT_PATH}\ \nSLX_VMWARE_PATH=${SLX_VMWARE_PATH}\n" \ - > $(DESTDIR)$(SLX_CONFIG_PATH)/settings.default; \ - test -e $(DESTDIR)$(SLX_CONFIG_PATH)/settings.local || \ - echo -e "# local setup for openslx (overrides settings.default)\n" \ - > $(DESTDIR)$(SLX_CONFIG_PATH)/settings.local; \ + > $(DESTDIR)$(SLX_SHARE_PATH)/settings.default; \ + test -e $(DESTDIR)$(SLX_CONFIG_PATH)/settings || \ + echo -e "# Local setup for OpenSLX (overrides default settings).\ +\n#\n# Please look at $(SLX_SHARE_PATH)/settings.default and the docs to learn\ +\n# about the available options.\n" \ + > $(DESTDIR)$(SLX_CONFIG_PATH)/settings; \ @ # create slxversion script: @if test -e REVISION; then \ |