diff options
| author | Steven Barth <steven@midlink.org> | 2008-03-18 15:46:56 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-03-18 15:46:56 +0000 |
| commit | 8e1207cfc2d9ae4a68894bc904b1ab52f15b9132 (patch) | |
| tree | c025d1ae353c06c532b59c867a7712bf0d9a0c15 | |
| parent | f41539e5493dc8ba3059730f77a6fbb7595aae5a (diff) | |
* Fixed Makefile and postinst-script to work correctly
(Thanks to Mickey from FF Hannover)
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | contrib/package/ffluci/ipkg/ffluci.postinst | 2 |
2 files changed, 3 insertions, 4 deletions
@@ -8,7 +8,7 @@ ffluci/fs.lua ffluci/i18n.lua ffluci/model/uci.lua \ ffluci/template.lua ffluci/cbi.lua ffluci/dispatcher.lua \ ffluci/menu.lua ffluci/init.lua ffluci/sys.lua -DIRECTORIES = dist/ffluci/model dist/ffluci/controller/public dist/ffluci/controller/admin dist/ffluci/i18n dist/ffluci/view +DIRECTORIES = dist/ffluci/model dist/ffluci/controller dist/ffluci/i18n dist/ffluci/view INFILES = $(CFILES:%=src/%) OUTFILE = ffluci/init.lua @@ -25,8 +25,7 @@ examples-source: source examples dist: - cp src/ffluci/controller/public/* dist/ffluci/controller/public/ - cp src/ffluci/controller/admin/* dist/ffluci/controller/admin/ + cp src/ffluci/controller/* dist/ffluci/controller/ -R cp src/ffluci/i18n/* dist/ffluci/i18n/ cp src/ffluci/view/* dist/ffluci/view/ -R diff --git a/contrib/package/ffluci/ipkg/ffluci.postinst b/contrib/package/ffluci/ipkg/ffluci.postinst index 0dbac00eb7..7265cb96b8 100755 --- a/contrib/package/ffluci/ipkg/ffluci.postinst +++ b/contrib/package/ffluci/ipkg/ffluci.postinst @@ -1,4 +1,4 @@ #!/bin/sh PATTERN='/cgi-bin/ffluci/admin:root:$p$root' grep $PATTERN ${IPKG_INSTROOT}/etc/httpd.conf >/dev/null 2>/dev/null || echo $PATTERN >> ${IPKG_INSTROOT}/etc/httpd.conf -[ -z ${IPKG_INSTROOT} ] && /etc/init.d/httpd restart +[ -n ${IPKG_INSTROOT} ] || /etc/init.d/httpd restart |