update-config: write new config at the end

[iserv-mod-error-reporter.git] / Makefile

diff --git a/Makefile b/Makefile
index 43ad927..c2c2be7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,11 @@ MKDIR=mkdir -p
 links: sourcedoc
        # documentation
        $(MKDIR) $(DESTDIR)/usr/share/doc/iserv-mod-error-reporter/source/
-       $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/
+       $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/error-reporter/
        $(LN) doc/TODO $(DESTDIR)/usr/share/doc/iserv-mod-error-reporter/
        $(LN) doc/changelog.old.html $(DESTDIR)/usr/share/doc/iserv-mod-error-reporter/
        $(LN) doc/source/* $(DESTDIR)/usr/share/doc/iserv-mod-error-reporter/source/
-       $(LN) -s ../../iserv-mod-error-reporter $(DESTDIR)/usr/share/doc/iserv/mod/error-reporter/
+       $(LN) -s ../../iserv-mod-error-reporter $(DESTDIR)/usr/share/doc/iserv/mod/error-reporter
        
        # images
        $(MKDIR) $(DESTDIR)/usr/share/iserv/www/img/default/16/
@@ -70,18 +70,21 @@ links: sourcedoc
        $(LN) inc/{class*,init,functions}.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_error-reporter/
        
        # navigation
-       $(MKDIR) $(DESTDIR)/usr/share/iserv/www/nav/admin/
+       $(MKDIR) $(DESTDIR)/usr/share/iserv/www/nav/
        $(LN) nav/*.mod $(DESTDIR)/usr/share/iserv/www/nav/
-       $(LN) nav/admin/*.mod $(DESTDIR)/usr/share/iserv/www/nav/admin/
        
        # web pages
        $(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_error-reporter/
-       $(LN) src/{config,detail,index}.php $(DESTDIR)/usr/share/iserv/www/mod_error-reporter/
+       $(LN) src/{detail,index}.php $(DESTDIR)/usr/share/iserv/www/mod_error-reporter/
        
        # config
        $(MKDIR) $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/config.template/
        $(LN) config/82error-reporter $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/config.template/
        
+       # iservchk
+       $(MKDIR) $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/chk.d/99errorreporter/
+       $(LN) iservchk/* $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/chk.d/99errorreporter/
+       
        # maintenance files
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/error-reporter/
        $(LN) maint/* $(DESTDIR)/usr/share/iserv/modules/error-reporter
@@ -93,9 +96,12 @@ sourcedoc:
        doxygen
        mv doc/source/html/* doc/source/ && rm -rf doc/source/html
 
+install: sourcedoc links
+
 # clean up
 clean:
        if [ -e Doxyfile ]; then rm Doxyfile; fi;
        $(RM) doc/source
 
 .PHONY: clean install
+