Merge 0.10->trunk

[prosody.git] / tools / migration / Makefile

diff --git a/tools/migration/Makefile b/tools/migration/Makefile
index 5998a5f706b344831cd8b06407106835569b84cd..713831d2ce6a7ee3c25af8588585c5f3724e6903 100644 (file)
--- a/tools/migration/Makefile
+++ b/tools/migration/Makefile
@@ -3,13 +3,13 @@ include ../../config.unix
 
 BIN = $(DESTDIR)$(PREFIX)/bin
 CONFIG = $(DESTDIR)$(SYSCONFDIR)
-SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+SOURCE = $(DESTDIR)$(LIBDIR)/prosody
 DATA = $(DESTDIR)$(DATADIR)
 MAN = $(DESTDIR)$(PREFIX)/share/man
 
-INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDSOURCE = $(LIBDIR)/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
-INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+INSTALLEDMODULES = $(LIBDIR)/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
 SOURCE_FILES = migrator/*.lua
@@ -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