aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-03-21 19:39:04 +0000
committerMatthew Wild <mwild1@gmail.com>2011-03-21 19:39:04 +0000
commit1f049ed80d3a07636a207b859cc236e3d39eb4f1 (patch)
tree1eefc745a5c6af63097949fb3ac774d915adf225
parentb94b9eba5ea54ee73b13c6266f071db9ad685a7d (diff)
downloadprosody-1f049ed80d3a07636a207b859cc236e3d39eb4f1.tar.gz
prosody-1f049ed80d3a07636a207b859cc236e3d39eb4f1.zip
tools/migration: Rename main.lua -> prosody-migrator.lua and update the Makefile
-rw-r--r--tools/migration/Makefile6
-rw-r--r--tools/migration/prosody-migrator.lua (renamed from tools/migration/main.lua)0
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/migration/Makefile b/tools/migration/Makefile
index adceafd4..5998a5f7 100644
--- a/tools/migration/Makefile
+++ b/tools/migration/Makefile
@@ -14,7 +14,7 @@ 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,10 @@ clean:
rm -f prosody-migrator.install
rm -f migrator.cfg.lua.install
-prosody-migrator.install: main.lua
+prosody-migrator.install: prosody-migrator.lua
sed "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)';|;" \
diff --git a/tools/migration/main.lua b/tools/migration/prosody-migrator.lua
index 82eeab9d..82eeab9d 100644
--- a/tools/migration/main.lua
+++ b/tools/migration/prosody-migrator.lua