summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-07-19 02:53:28 +0200
committerDaniel Baumann <daniel@debian.org>2012-07-19 02:53:28 +0200
commit5816e7afe0d8187b4ffd627689e1aa427a1c1fc8 (patch)
tree33dabd43efc6f784d71684e72f3f68ef36fced03
parentad4a519ccc6596d4f02070c4b451e8f8ce235b27 (diff)
downloadvyos-live-build-5816e7afe0d8187b4ffd627689e1aa427a1c1fc8.tar.gz
vyos-live-build-5816e7afe0d8187b4ffd627689e1aa427a1c1fc8.zip
Moving main executables away from scripts subdirectory.
-rw-r--r--Makefile4
-rwxr-xr-xbin/lb (renamed from scripts/build/lb)0
-rwxr-xr-xbin/live-build (renamed from scripts/build/live-build)0
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bd2fc4506..61648874f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
LANGUAGES = $(shell cd manpages/po && ls)
-SCRIPTS = frontends/cgi/live-build-cgi frontends/cgi/live-build-cgi.cron functions/* examples/*/*.sh examples/auto/* scripts/*.sh scripts/*/* share/hooks/*
+SCRIPTS = bin/* frontends/cgi/live-build-cgi frontends/cgi/live-build-cgi.cron functions/* examples/*/*.sh examples/auto/* scripts/*.sh scripts/*/* share/hooks/*
all: build
@@ -45,7 +45,7 @@ install:
# Installing executables
mkdir -p $(DESTDIR)/usr/bin
- mv $(DESTDIR)/usr/share/live/build/scripts/build/lb $(DESTDIR)/usr/share/live/build/scripts/build/live-build $(DESTDIR)/usr/bin
+ cp -a bin/* $(DESTDIR)/usr/bin
# Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-build
diff --git a/scripts/build/lb b/bin/lb
index 2f2320308..2f2320308 100755
--- a/scripts/build/lb
+++ b/bin/lb
diff --git a/scripts/build/live-build b/bin/live-build
index bb8d9620a..bb8d9620a 100755
--- a/scripts/build/live-build
+++ b/bin/live-build