diff --git a/Makefile b/Makefile index 31f2a33..82007a8 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,10 @@ soju: $(GO) build $(GOFLAGS) ./cmd/soju sojuctl: $(GO) build $(GOFLAGS) ./cmd/sojuctl +soju-znc-import: + $(GO) build $(GOFLAGS) ./cmd/soju-znc-import doc/soju.1: doc/soju.1.scd $(SCDOC) doc/soju.1 - clean: $(RM) -f soju sojuctl doc/soju.1 install: @@ -26,4 +27,4 @@ install: cp -f doc/soju.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 [ -f $(DESTDIR)/etc/soju/config ] || cp -f config.in $(DESTDIR)/etc/soju/config -.PHONY: soju sojuctl clean install +.PHONY: soju sojuctl soju-znc-import clean install diff --git a/contrib/znc-import.go b/cmd/soju-znc-import/main.go similarity index 99% rename from contrib/znc-import.go rename to cmd/soju-znc-import/main.go index 400daf0..a865516 100644 --- a/contrib/znc-import.go +++ b/cmd/soju-znc-import/main.go @@ -16,7 +16,7 @@ import ( "git.chaotic.ninja/koizumi.aoi/soju-retro/config" ) -const usage = `usage: znc-import [options...] +const usage = `usage: soju-znc-import [options...] Imports configuration from a ZNC file. Users and networks are merged if they already exist in the soju database. ZNC settings overwrite existing soju