Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets
Show
Ignore:
Timestamp:
05/03/08 00:25:41 (7 months ago)
Author:
rats
Message:

* Fixed #1222: FreeBSD: Fix some path and config and insert old daemon routine
* Fixed #1195: Gentoo: Somewhat large Gentoo update

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BSDmakefile

    r1056 r1134  
    3131# 
    3232 
     33 
    3334.ifdef $(OSTYPE)==FreeBSD 
    3435.include <Makefile.fbsd> 
    …… 
    3839 
    3940install: 
    40  
     41        # 
     42        # Preparing ISPCP System Directory and files     
     43        # 
    4144        cd ./tools && $(MAKE) install 
    4245        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF) 
    …… 
    5356        cd ./keys && $(MAKE) install 
    5457 
     58        # 
    5559        # Patch some variable 
     60        # 
    5661        /usr/bin/sed s/"\/etc\/ispcp\/ispcp.conf"/"\/usr\/local\/etc\/ispcp\/ispcp.conf"/g ./engine/ispcp_common_code.pl > $(SYSTEM_ROOT)/engine/ispcp_common_code.pl 
    57         /usr/bin/sed s/"\/apache\"\;"/"\/apache22\"\;"/g ./engine/setup/ispcp-setup-methods.pl > $(SYSTEM_ROOT)/engine/setup/ispcp-setup-methods.pl 
     62 
     63.if exists ($(SYSTEM_WEB)/ispcp/engine/ispcp-db-keys.pl) 
     64        # 
     65        # Previous database key detected, assuming being perform Upgrade Procedure 
     66        #        
     67        cp $(SYSTEM_WEB)/ispcp/engine/ispcp-db-keys.pl $(SYSTEM_ROOT)/engine/ 
     68        cp $(SYSTEM_WEB)/ispcp/engine/messager/ispcp-db-keys.pl $(SYSTEM_ROOT)/engine/messager/ 
     69        cp $(SYSTEM_WEB)/ispcp/gui/include/ispcp-db-keys.php $(SYSTEM_ROOT)/gui/include/ 
     70        cp $(SYSTEM_WEB)/ispcp/gui/tools/pma/config.inc.php $(SYSTEM_ROOT)/gui/tools/pma/ 
     71.endif 
    5872 
    5973        cd ${INST_PREF} && cp -R * / 
    6074        rm -rf ${INST_PREF} 
    6175 
     76        # 
     77        # 
     78        # If Some error occured please read FAQ first and search at forum in http://www.isp-control.net 
     79        # Go to $(SYSTEM_WEB)/ispcp/engine/setup and type "ispcp-setup" to configure or "ispcp-upgrade"  
     80        # to complete upgrade process 
    6281 
    6382uninstall: 
    …… 
    81100 
    82101        cd ./tools/daemon && $(MAKE) clean 
     102 
     103