diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-12-01 13:54:44 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-12-01 13:57:56 +0100 |
| commit | 8921750aa4f89ad1a3258cc29ed264e602b22ce4 (patch) | |
| tree | 49d03deb85e3846bff8115c04d30ca4ddef8859c | |
| parent | ff504029432852faef500497fc586f8fdc46bf37 (diff) | |
Build HTML in /var/www/radsecproxy/.
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | packaging/docker/start.sh | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -7,8 +7,10 @@ else IKIWIKI=ikiwiki endif +DESTDIR ?= html + all: - $(IKIWIKI) `pwd` html -v --wikiname radsecproxy \ + $(IKIWIKI) `pwd` $(DESTDIR) -v --wikiname radsecproxy \ --plugin=goodstuff \ --plugin=sidebar \ --exclude=html \ @@ -17,4 +19,5 @@ all: --exclude=packaging clean: - rm -rf .ikiwiki html + rm -rf .ikiwiki $(DESTDIR) + diff --git a/packaging/docker/start.sh b/packaging/docker/start.sh index f518ca9..fe47429 100755 --- a/packaging/docker/start.sh +++ b/packaging/docker/start.sh @@ -1,5 +1,5 @@ #! /bin/sh -if [ -f /var/www/Makefile ]; then - make -C /var/www + +if [ -f /usr/local/src/radsecproxy-web/Makefile ]; then + make -C /usr/local/src/radsecproxy-web DESTDIR=/var/www/radsecproxy fi -/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf |