summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-06-25 09:04:42 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2013-06-25 09:04:42 +0200
commit86746ac72fb9dc558e40914de9aea26ad58d19b1 (patch)
treec8b99efde0ed4d6e77351eb9cc189d635162e188
parent1807e40dd3666564851b2b0d855513bd004a927d (diff)
downloadvyos-live-build-86746ac72fb9dc558e40914de9aea26ad58d19b1.tar.gz
vyos-live-build-86746ac72fb9dc558e40914de9aea26ad58d19b1.zip
Reorganizing frontend in source tree.
-rw-r--r--Makefile6
-rw-r--r--frontend/cgi/Makefile (renamed from frontends/cgi/Makefile)0
-rwxr-xr-xfrontend/cgi/live-build-cgi (renamed from frontends/cgi/live-build-cgi)0
-rwxr-xr-xfrontend/cgi/live-build-cgi.cron (renamed from frontends/cgi/live-build-cgi.cron)0
-rw-r--r--frontend/cgi/live-build-cgi.crontab (renamed from frontends/cgi/live-build-cgi.crontab)0
-rw-r--r--frontend/cgi/live-build-cgi.default (renamed from frontends/cgi/live-build-cgi.default)0
-rw-r--r--frontend/cgi/live-build-cgi.logrotate (renamed from frontends/cgi/live-build-cgi.logrotate)0
-rwxr-xr-xfrontend/cli/lb (renamed from bin/lb)0
-rwxr-xr-xfrontend/cli/live-build (renamed from bin/live-build)0
9 files changed, 3 insertions, 3 deletions
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
index 8ac08ddac..8ac08ddac 100644
--- a/frontends/cgi/Makefile
+++ b/frontend/cgi/Makefile
diff --git a/frontends/cgi/live-build-cgi b/frontend/cgi/live-build-cgi
index 49cb1e5bf..49cb1e5bf 100755
--- a/frontends/cgi/live-build-cgi
+++ b/frontend/cgi/live-build-cgi
diff --git a/frontends/cgi/live-build-cgi.cron b/frontend/cgi/live-build-cgi.cron
index bd2694d8f..bd2694d8f 100755
--- a/frontends/cgi/live-build-cgi.cron
+++ b/frontend/cgi/live-build-cgi.cron
diff --git a/frontends/cgi/live-build-cgi.crontab b/frontend/cgi/live-build-cgi.crontab
index 1bf7a815d..1bf7a815d 100644
--- a/frontends/cgi/live-build-cgi.crontab
+++ b/frontend/cgi/live-build-cgi.crontab
diff --git a/frontends/cgi/live-build-cgi.default b/frontend/cgi/live-build-cgi.default
index c7e26bc5f..c7e26bc5f 100644
--- a/frontends/cgi/live-build-cgi.default
+++ b/frontend/cgi/live-build-cgi.default
diff --git a/frontends/cgi/live-build-cgi.logrotate b/frontend/cgi/live-build-cgi.logrotate
index 75d89a9eb..75d89a9eb 100644
--- a/frontends/cgi/live-build-cgi.logrotate
+++ b/frontend/cgi/live-build-cgi.logrotate
diff --git a/bin/lb b/frontend/cli/lb
index a57577f94..a57577f94 100755
--- a/bin/lb
+++ b/frontend/cli/lb
diff --git a/bin/live-build b/frontend/cli/live-build
index d78060bef..d78060bef 100755
--- a/bin/live-build
+++ b/frontend/cli/live-build