summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-01-26 17:07:40 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:40 +0100
commit9ce762a50229bebd07600f1c29167db31f8bfb53 (patch)
tree638905a7598e0e13177696482b87f756764fcbdf /Makefile
parent58d6b235f955c9d8b7f8bd7c03360b712840b269 (diff)
downloadvyos-live-build-9ce762a50229bebd07600f1c29167db31f8bfb53.tar.gz
vyos-live-build-9ce762a50229bebd07600f1c29167db31f8bfb53.zip
Using common function file to source shell includes.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2de14ff0f..ac0892b04 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ all: build
test:
# Checking for syntax errors
- set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \
+ set -e; for SCRIPT in functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \
do \
sh -n $$SCRIPT; \
done
@@ -14,7 +14,7 @@ test:
# Checking for bashisms
set -e; if [ -x /usr/bin/checkbashisms ]; \
then \
- checkbashisms functions/* examples/*/*.sh helpers/* hooks/*; \
+ checkbashisms functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \
else \
echo "bashism test skipped - you need to install devscripts."; \
fi
@@ -29,7 +29,7 @@ install:
# Installing shared data
mkdir -p $(DESTDIR)/usr/share/live-helper
- cp -r data examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
+ cp -r data examples functions.sh functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
# Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-helper
@@ -98,7 +98,7 @@ uninstall:
done
update:
- set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.en.*; \
+ set -e; for FILE in functions.sh functions/*.sh examples/cron/*.sh manpages/*.en.*; \
do \
sed -i -e 's/2007\\-11\\-26/2007\\-12\\-03/' \
-e 's/26.11.2007/03.12.2007/' \