diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
| commit | 1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a (patch) | |
| tree | 35cdd4996c2ba4c67a4805bd01e3830d1dc171f5 /tools/migration/Makefile | |
| parent | 272ca5fce11d42d9cd3b50c0f3baa03729583443 (diff) | |
| parent | ca74173a8221e9cd93db30c7bb89c8b181f8b60b (diff) | |
| download | prosody-1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a.tar.gz prosody-1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a.zip | |
Merge 0.8->trunk
Diffstat (limited to 'tools/migration/Makefile')
| -rw-r--r-- | tools/migration/Makefile | 6 |
1 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)';|;" \ |