Changeset 1348


Ignore:
Timestamp:
2000-08-03T18:57:49+12:00 (24 years ago)
Author:
jrm21
Message:

A few minor changes while merging branch to help clean compilation

Location:
trunk/gsdl
Files:
1 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/packages/mg/Makefile.in

    r692 r1348  
    7171
    7272distclean: distclean-recursive distclean-local
    73     rm config.status
     73    rm -f config.status
    7474
    7575maintainer-clean: maintainer-clean-recursive maintainer-clean-local
    76     rm config.status
     76    rm -f config.status
    7777
    7878mostlyclean-recursive clean-recursive distclean-recursive \
  • trunk/gsdl/packages/yaz/Makefile.am

    r1343 r1348  
    1 ## $Id$
    2 
    31AUTOMAKE_OPTIONS = foreign
    42
  • trunk/gsdl/packages/yaz/README.yaz

    r1343 r1348  
    44
    55Compilation and installation instructions for YAZ
    6   $Id$
    76
    87The primary output of the source here is the lib/libyaz.a library,
  • trunk/gsdl/packages/yaz/TODO

    r1343 r1348  
    1 YAZ TODO $Id$
    21
    32Complete Unicode support.
  • trunk/gsdl/packages/yaz/configure.in

    r1343 r1348  
    22dnl (c) Index Data 1994-2000
    33dnl See the file LICENSE for details.
    4 dnl $Id$
    54AC_INIT(include/yaz/yaz-version.h)
    65AM_INIT_AUTOMAKE(yaz, 1.6)
  • trunk/gsdl/packages/yaz/mkinstalldirs

    r1343 r1348  
    55# Public domain
    66
    7 # $Id$
    87
    98errstatus=0
  • trunk/gsdl/packages/yaz/util/yaz-comp

    r1343 r1348  
    11#!/bin/sh
    22# the next line restarts using tclsh \
    3 exec tclsh "$0" "$@"
     3if test -e "`which tclsh`";then exec tclsh "$0" "$@";else exec tclsh8.0 "$0" "$@";fi
    44#
    55# yaz-comp: ASN.1 Compiler for YAZ
    66# (c) Index Data 1996-2000
    77# See the file LICENSE for details.
    8 #
    9 # $Log$
    10 # Revision 1.1  2000/08/03 03:12:12  johnmcp
    11 # Added the YAZ toolkit source to the packages directory (for z39.50 stuff)
    128#
    139# Revision 1.1  2000/03/02 08:48:20  adam
  • trunk/gsdl/packages/yaz/windows.txt

    r1343 r1348  
    11YAZ Compilation guidelines for winNT/95.
    2   $Id$
    32
    43This distribution of YAZ includes makefiles that works with Visual
  • trunk/gsdl/src/colservr/Makefile.in

    r1338 r1348  
    5252
    5353MG_OBJECTS = mgq.o mgsearch.o mgqueryfilter.o
     54MGPP_OBJECTS = mgppsearch.o mgppqueryfilter.o
    5455
    5556else
     
    103104
    104105all : $(OBJECTS)
     106    make USE_MGPP=1 $(MGPP_OBJECTS)
    105107
    106108distclean:
  • trunk/gsdl/src/recpt/Makefile.in

    r1347 r1348  
    150150
    151151## z39.50 stuff
    152 $(YAZDIR)/client/yaz_zclient.o: $(YAZDIR)/client/yaz_zclient.h $(YAZDIR)/client/yaz_zclient.c $(YAZDIR)/lib/libyaz.a
     152$(YAZDIR)/client/yaz_zclient.o: $(YAZDIR)/lib/libyaz.a
    153153    cd $(YAZDIR)/client &&  make yaz_zclient.o
    154154
     
    156156    cd $(YAZDIR) && ./configure && make all
    157157
    158 z3950server.o: $(YAZDIR)/client/yaz_zclient.h
    159 
    160158zparse.tab.c: zparse.y
    161159    @YACC@ -d zparse.y
  • trunk/gsdl/src/recpt/documentaction.cpp

    r1347 r1348  
    391391      disp.setmacro ("gsdltop", "Global", "documenttop");
    392392    }
    393     text_tmap::iterator it = cinfo->format.find ("homepage");
    394     if (it != cinfo->format.end()) {
     393    text_tmap::iterator it = cinfo.format.find ("homepage");
     394    if (it != cinfo.format.end()) {
    395395      text_t httppagehome;
    396396      if (get_link (args, protos, (*it).second, httppagehome, logout))
Note: See TracChangeset for help on using the changeset viewer.