summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-04-29 08:12:46 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2015-04-29 08:12:46 +0200
commit320b1ce75e04541613f5e5e70271be6d41bb7c79 (patch)
treefce045e534d1fd3bb356673bbe0d7cad246fba3c
parent4077a3de7de8bc17dfc2782a206ffecdf6f8178d (diff)
downloadvyos-live-build-320b1ce75e04541613f5e5e70271be6d41bb7c79.tar.gz
vyos-live-build-320b1ce75e04541613f5e5e70271be6d41bb7c79.zip
Flattening frontend directory within the source tree.
-rw-r--r--Makefile4
-rwxr-xr-xfrontend/lb (renamed from frontend/cli/lb)0
-rwxr-xr-xfrontend/live-build (renamed from frontend/cli/live-build)0
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 965719f65..77d134982 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
LANGUAGES = $(shell cd manpages/po && ls)
-SCRIPTS = frontend/cli/* functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
+SCRIPTS = frontend/* functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
all: build
@@ -45,7 +45,7 @@ install:
# Installing executables
mkdir -p $(DESTDIR)/usr/bin
- cp -a frontend/cli/* $(DESTDIR)/usr/bin
+ cp -a frontend/* $(DESTDIR)/usr/bin
mkdir -p $(DESTDIR)/usr/lib/live
cp -a scripts/* $(DESTDIR)/usr/lib/live
diff --git a/frontend/cli/lb b/frontend/lb
index 03ab043d3..03ab043d3 100755
--- a/frontend/cli/lb
+++ b/frontend/lb
diff --git a/frontend/cli/live-build b/frontend/live-build
index 52b843730..52b843730 100755
--- a/frontend/cli/live-build
+++ b/frontend/live-build