From 86746ac72fb9dc558e40914de9aea26ad58d19b1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Tue, 25 Jun 2013 09:04:42 +0200
Subject: [PATCH] Reorganizing frontend in source tree.

---
 Makefile                                             | 6 +++---
 {frontends => frontend}/cgi/Makefile                 | 0
 {frontends => frontend}/cgi/live-build-cgi           | 0
 {frontends => frontend}/cgi/live-build-cgi.cron      | 0
 {frontends => frontend}/cgi/live-build-cgi.crontab   | 0
 {frontends => frontend}/cgi/live-build-cgi.default   | 0
 {frontends => frontend}/cgi/live-build-cgi.logrotate | 0
 {bin => frontend/cli}/lb                             | 0
 {bin => frontend/cli}/live-build                     | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename {frontends => frontend}/cgi/Makefile (100%)
 rename {frontends => frontend}/cgi/live-build-cgi (100%)
 rename {frontends => frontend}/cgi/live-build-cgi.cron (100%)
 rename {frontends => frontend}/cgi/live-build-cgi.crontab (100%)
 rename {frontends => frontend}/cgi/live-build-cgi.default (100%)
 rename {frontends => frontend}/cgi/live-build-cgi.logrotate (100%)
 rename {bin => frontend/cli}/lb (100%)
 rename {bin => frontend/cli}/live-build (100%)

diff --git a/Makefile b/Makefile
index 6b572f592..b4a9c44dc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* frontends/cgi/live-build-cgi frontends/cgi/live-build-cgi.cron functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
+SCRIPTS = frontend/cli/* frontend/cgi/live-build-cgi frontend/cgi/live-build-cgi.cron functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
 
 all: build
 
@@ -46,12 +46,12 @@ build:
 install:
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live/build
-	cp -r frontends/cgi data functions templates VERSION $(DESTDIR)/usr/share/live/build
+	cp -r frontend/cgi data functions templates VERSION $(DESTDIR)/usr/share/live/build
 	cp -r share/* $(DESTDIR)/usr/share/live/build
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
-	cp -a bin/* $(DESTDIR)/usr/bin
+	cp -a frontend/cli/* $(DESTDIR)/usr/bin
 
 	mkdir -p $(DESTDIR)/usr/lib/live
 	cp -a scripts/* $(DESTDIR)/usr/lib/live
diff --git a/frontends/cgi/Makefile b/frontend/cgi/Makefile
similarity index 100%
rename from frontends/cgi/Makefile
rename to frontend/cgi/Makefile
diff --git a/frontends/cgi/live-build-cgi b/frontend/cgi/live-build-cgi
similarity index 100%
rename from frontends/cgi/live-build-cgi
rename to frontend/cgi/live-build-cgi
diff --git a/frontends/cgi/live-build-cgi.cron b/frontend/cgi/live-build-cgi.cron
similarity index 100%
rename from frontends/cgi/live-build-cgi.cron
rename to frontend/cgi/live-build-cgi.cron
diff --git a/frontends/cgi/live-build-cgi.crontab b/frontend/cgi/live-build-cgi.crontab
similarity index 100%
rename from frontends/cgi/live-build-cgi.crontab
rename to frontend/cgi/live-build-cgi.crontab
diff --git a/frontends/cgi/live-build-cgi.default b/frontend/cgi/live-build-cgi.default
similarity index 100%
rename from frontends/cgi/live-build-cgi.default
rename to frontend/cgi/live-build-cgi.default
diff --git a/frontends/cgi/live-build-cgi.logrotate b/frontend/cgi/live-build-cgi.logrotate
similarity index 100%
rename from frontends/cgi/live-build-cgi.logrotate
rename to frontend/cgi/live-build-cgi.logrotate
diff --git a/bin/lb b/frontend/cli/lb
similarity index 100%
rename from bin/lb
rename to frontend/cli/lb
diff --git a/bin/live-build b/frontend/cli/live-build
similarity index 100%
rename from bin/live-build
rename to frontend/cli/live-build