[Dotgnu-pnet-commits] pnetlib/I18N I18N.build, 1.11, 1.12 Makefile.am, 1.6, 1.7

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/I18N
In directory subversions:/tmp/cvs-serv5469/I18N

Modified Files:
        I18N.build Makefile.am 
Log Message:


Fix out of tree builds.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am 26 Nov 2003 06:43:34 -0000      1.6
--- Makefile.am 27 Nov 2003 01:00:56 -0000      1.7
***************
*** 11,20 ****
  build-assemblies:
        test -d first || mkdir first
!       "$(CSANT)" $(CSANT_FLAGS) -f I18N.build all
        @$(MAKE) $(AM_MAKEFLAGS) $(HANDLER_FILE)
!       "$(CSANT)" $(CSANT_FLAGS) -f I18N.build phase-two
  
  $(HANDLER_FILE): first/I18N.dll $(REGION_ASSEMBLIES)
!       $(SHELL) mklist.sh "$(ILFIND)" $(HANDLER_FILE) \
                        first/I18N.dll $(REGION_ASSEMBLIES)
  
--- 11,22 ----
  build-assemblies:
        test -d first || mkdir first
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
!                       -f "$(srcdir)/I18N.build" all
        @$(MAKE) $(AM_MAKEFLAGS) $(HANDLER_FILE)
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
!                       -f "$(srcdir)/I18N.build" phase-two
  
  $(HANDLER_FILE): first/I18N.dll $(REGION_ASSEMBLIES)
!       $(SHELL) "$(srcdir)/mklist.sh" "$(ILFIND)" $(HANDLER_FILE) \
                        first/I18N.dll $(REGION_ASSEMBLIES)
  
***************
*** 24,32 ****
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(libdir)/cscc/lib
!       "$(CSANT)" $(CSANT_FLAGS) -f I18N.build \
!                       -a $(DESTDIR)$(libdir)/cscc/lib -i all phase-two
  
  uninstall-local:
        @$(NORMALL_UNINSTALL)
!       "$(CSANT)" $(CSANT_FLAGS) -f I18N.build \
!                       -a $(DESTDIR)$(libdir)/cscc/lib -u all phase-two
--- 26,34 ----
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(libdir)/cscc/lib
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . -f "$(srcdir)/I18N.build" 
\
!                       -i all phase-two
  
  uninstall-local:
        @$(NORMALL_UNINSTALL)
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . -f "$(srcdir)/I18N.build" 
\
!                       -u all phase-two

Index: I18N.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/I18N.build,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** I18N.build  26 Nov 2003 06:43:34 -0000      1.11
--- I18N.build  27 Nov 2003 01:00:56 -0000      1.12
***************
*** 46,54 ****
  
                        <resources>
!                               <file name="CJK/jis.table"/>
!                               <file name="CJK/ksc.table"/>
!                               <file name="CJK/johab.table"/>
!                               <file name="CJK/big5.table"/>
!                               <file name="CJK/gb.table"/>
                        </resources>
  
--- 46,54 ----
  
                        <resources>
!                               <file basedir="${csant.src.dir}" 
name="CJK/jis.table"/>
!                               <file basedir="${csant.src.dir}" 
name="CJK/ksc.table"/>
!                               <file basedir="${csant.src.dir}" 
name="CJK/johab.table"/>
!                               <file basedir="${csant.src.dir}" 
name="CJK/big5.table"/>
!                               <file basedir="${csant.src.dir}" 
name="CJK/gb.table"/>
                        </resources>