* Fixed Makefile and postinst-script to work correctly

(Thanks to Mickey from FF Hannover)

diff --git a/Makefile b/Makefile
index 317f3a666733a76cab0ba25f32176d1d93063215..e2a74c0889690047124aaf26f24a7c4c0436e869 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 0dbac00eb76c23daeedca926ebc92ad826ac9211..7265cb96b881d2c87481e9c6c1bf9e1145b894e9 100755 (executable)
--- 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