diff options
author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2014-01-10 02:32:16 -0800 |
---|---|---|
committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2014-01-10 02:32:16 -0800 |
commit | 7c3c9c8794ddeb4a61afa44817b6e267be771e2c (patch) | |
tree | c2ed008c32f8cc5d3f3229b05ee16b9babfb0c19 | |
parent | b7ac94099f9c68272541e90869115105882c285a (diff) | |
parent | 9fb2a238d99480bf966a67abb1de1b9a7d4eb6e5 (diff) | |
download | luarocks-7c3c9c8794ddeb4a61afa44817b6e267be771e2c.tar.gz luarocks-7c3c9c8794ddeb4a61afa44817b6e267be771e2c.tar.bz2 luarocks-7c3c9c8794ddeb4a61afa44817b6e267be771e2c.zip |
Merge pull request #219 from Tieske/master
bugfix: /CONFIG option to follow install location, so /P will have effec...
-rw-r--r-- | install.bat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install.bat b/install.bat index 8b0aa95f..22cdd523 100644 --- a/install.bat +++ b/install.bat | |||
@@ -125,7 +125,7 @@ Configuring the destinations: | |||
125 | /SCRIPTS [dir] Where to install commandline scripts installed by | 125 | /SCRIPTS [dir] Where to install commandline scripts installed by |
126 | rocks. Default is {TREE}/bin. | 126 | rocks. Default is {TREE}/bin. |
127 | /CONFIG [dir] Location where the config file should be installed. | 127 | /CONFIG [dir] Location where the config file should be installed. |
128 | Default is %PROGRAMFILES%\LuaRocks | 128 | Default is to follow /P option |
129 | /SELFCONTAINED Creates a self contained installation in a single | 129 | /SELFCONTAINED Creates a self contained installation in a single |
130 | directory given by /P. | 130 | directory given by /P. |
131 | Sets the /TREE and /CONFIG options to the same | 131 | Sets the /TREE and /CONFIG options to the same |
@@ -592,7 +592,7 @@ else | |||
592 | -- our target interpreter is 64bit, so the tree (with binaries) should go into 64bit program files | 592 | -- our target interpreter is 64bit, so the tree (with binaries) should go into 64bit program files |
593 | datapath = os.getenv("ProgramW6432") .. [[\LuaRocks]] | 593 | datapath = os.getenv("ProgramW6432") .. [[\LuaRocks]] |
594 | end | 594 | end |
595 | vars.SYSCONFDIR = vars.SYSCONFDIR or datapath | 595 | vars.SYSCONFDIR = vars.SYSCONFDIR or vars.PREFIX |
596 | vars.ROCKS_TREE = vars.ROCKS_TREE or datapath..[[\systree]] | 596 | vars.ROCKS_TREE = vars.ROCKS_TREE or datapath..[[\systree]] |
597 | if SELFCONTAINED then | 597 | if SELFCONTAINED then |
598 | vars.SYSCONFDIR = vars.PREFIX | 598 | vars.SYSCONFDIR = vars.PREFIX |