diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-03 13:53:21 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-03 13:53:21 +0100 |
| commit | a5ccb8a860924f48570242e468267885137e3e9a (patch) | |
| tree | bf22e9f39d9ccaa98ba9f214cfa01d7c3408d46a /tools/migration | |
| parent | 1ea4d9ab7bde60b904192718247d49aa1337a18e (diff) | |
| parent | 1728207c6bb7f3955535ba4a2c1c6fde8e624ed8 (diff) | |
| download | prosody-a5ccb8a860924f48570242e468267885137e3e9a.tar.gz prosody-a5ccb8a860924f48570242e468267885137e3e9a.zip | |
Merge 0.9->trunk
Diffstat (limited to 'tools/migration')
| -rw-r--r-- | tools/migration/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/migration/Makefile b/tools/migration/Makefile index 5998a5f7..ae402bd2 100644 --- a/tools/migration/Makefile +++ b/tools/migration/Makefile @@ -29,7 +29,8 @@ clean: rm -f migrator.cfg.lua.install prosody-migrator.install: prosody-migrator.lua - sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ + sed "1s/\blua\b/$(RUNWITH)/; \ + s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;" \ < prosody-migrator.lua > prosody-migrator.install |