Merge 0.10->trunk

[prosody.git] / tools / migration / Makefile

diff --git a/tools/migration/Makefile b/tools/migration/Makefile
index adceafd406219a94eee05d57952c689f71f676ea..713831d2ce6a7ee3c25af8588585c5f3724e6903 100644 (file)
--- a/tools/migration/Makefile
+++ b/tools/migration/Makefile
@@ -3,18 +3,18 @@ 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
 
-all: prosody-migrator.install migrator.cfg.lua.install main.lua $(SOURCE_FILES)
+all: prosody-migrator.install migrator.cfg.lua.install prosody-migrator.lua $(SOURCE_FILES)
 
 install: prosody-migrator.install migrator.cfg.lua.install
        install -d $(BIN) $(CONFIG) $(SOURCE) $(SOURCE)/migrator
@@ -28,10 +28,11 @@ clean:
        rm -f prosody-migrator.install
        rm -f migrator.cfg.lua.install
 
-prosody-migrator.install: main.lua
-       sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
+prosody-migrator.install: prosody-migrator.lua
+       sed "1s/\blua\b/$(RUNWITH)/; \
+               s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
                s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;" \
-                       < main.lua > prosody-migrator.install
+                       < prosody-migrator.lua > prosody-migrator.install
 
 migrator.cfg.lua.install: migrator.cfg.lua
        sed "s|^local data_path = .*;$$|local data_path = '$(INSTALLEDDATA)';|;" \