greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16903

Show
Ignore:
Timestamp:
2008-08-19 14:49:37 (3 months ago)
Author:
mdewsnip
Message:

Moved compilation of iconv library from common-src/win32.mak to indexers/winMake.bat.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gsdl/trunk/common-src/win32.mak

    r16896 r16903  
    3434MDEFINES = /f win32.mak 
    3535 
    36 ICONVDIR = packages\windows\iconv\iconv 
    37  
    3836INDEXERSDIR = indexers 
    3937 
    …… 
    6563MAKECLEANCMD = $(MAKE) $(MDEFINES) clean 
    6664 
    67 all: win32.mak $(ICONVDIR) $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)  
     65all: win32.mak $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)  
    6866 
    6967install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS) 
    …… 
    113111        cd "$(COMMONHOME)" 
    114112 
    115 $(ICONVDIR): FORCE 
    116         cd "$(COMMONHOME)" 
    117         cd "$@" 
    118         $(MAKE) /f Makefile.msvc NO_NLS=1        
    119         cd "$(COMMONHOME)" 
    120  
    121113$(INDEXERSDIR): FORCE 
    122114        cd "$(COMMONHOME)" 

  • indexers/trunk/winMake.bat

    r16583 r16903  
    2323:all 
    2424        mkdir bin 
     25        cd packages\iconv 
     26        %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=1 %1 
     27        cd ..\.. 
     28 
    2529        cd packages\unac 
    2630        %MAKE% %MAKE_OPTIONS% win32.mak %1