Merge 0.9->trunk

[prosody.git] / tools / migration / Makefile

diff --git a/tools/migration/Makefile b/tools/migration/Makefile
index 839f2d87cb89e3a4ae8b3b4d47a075a6e7821c47..ae402bd21004827f5517184c0537a6f195031d0f 100644 (file)
--- a/tools/migration/Makefile
+++ b/tools/migration/Makefile
@@ -12,9 +12,9 @@ INSTALLEDCONFIG = $(SYSCONFDIR)
 INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
-SOURCE_FILES = main.lua migrator/*.lua
+SOURCE_FILES = migrator/*.lua
 
-all: prosody-migrator.install migrator.cfg.lua.install $(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)';|;" \