Changeset 18226 for gsdl/trunk


Ignore:
Timestamp:
2008-12-17T14:45:37+13:00 (15 years ago)
Author:
mdewsnip
Message:

Changed PACKAGES_DIR to RUNTIME_PACKAGES_DIR, for my sanity.

Location:
gsdl/trunk/runtime-src/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/runtime-src/src/corba/Makefile.in

    r18030 r18226  
    11###########################################################################
    22#
    3 # Makefile -- src/corba
     3# Makefile -- runtime-src/src/corba
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    3131INDEXERS_DIR = $(COMMON_DIR)/indexers
    3232COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    33 PACKAGES_DIR = $(RUNTIME_DIR)/packages
     33RUNTIME_PACKAGES_DIR = $(RUNTIME_DIR)/packages
    3434COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
    3535PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
    … …  
    5454MICO_VER = @MICO_VER@
    5555ifeq ($(MICO_DIR), default)
    56 MICO_INCLUDES = -I$(PACKAGES_DIR)/mico/mico/include
    57 MICO_PATH = $(PACKAGES_DIR)/mico/bin/
     56MICO_INCLUDES = -I$(RUNTIME_PACKAGES_DIR)/mico/mico/include
     57MICO_PATH = $(RUNTIME_PACKAGES_DIR)/mico/bin/
    5858else
    5959ifeq ($(MICO_DIR), yes)
    … …  
    7575INSTALL = @INSTALL@
    7676LDFLAGS = @LDFLAGS@
    77 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
    78         $(SQLITE_LIBS) -L$(PACKAGES_DIR)/mico/lib -lmico$(MICO_VER)
     77LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
     78    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) -L$(RUNTIME_PACKAGES_DIR)/mico/lib -lmico$(MICO_VER)
    7979RANLIB = @RANLIB@
    8080

  • gsdl/trunk/runtime-src/src/oaiservr/Makefile.in

    r18030 r18226  
    11###########################################################################
    22#
    3 # Makefile -- src/oaiservr
     3# Makefile -- runtime-src/src/oaiservr
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)/indexers
    32 PACKAGES_DIR = $(RUNTIME_DIR)/packages
    3332COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3433COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
    … …  
    4645USE_SQLITE = @USE_SQLITE@
    4746ifeq ($(USE_SQLITE), 1)
    48 SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
     47SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
    4948else
    5049SQLITE_LIBS =
    … …  
    5857INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
    5958LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    60 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     59LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
     60    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    6161INSTALL = @INSTALL@
    6262

  • gsdl/trunk/runtime-src/src/recpt/Makefile.in

    r18224 r18226  
    3131INDEXERS_DIR = $(COMMON_DIR)/indexers
    3232COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    33 PACKAGES_DIR = $(RUNTIME_DIR)/packages
     33RUNTIME_PACKAGES_DIR = $(RUNTIME_DIR)/packages
    3434COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
    3535PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
    … …  
    4747ifeq ($(USE_FASTCGI), 1)
    4848FASTCGI_DEFS = -DUSE_FASTCGI
    49 FASTCGI_INCLUDES = -I$(PACKAGES_DIR)/fcgi/include
    50 FASTCGI_LIBS = $(PACKAGES_DIR)/fcgi/libfcgi/libfcgi.a
     49FASTCGI_INCLUDES = -I$(RUNTIME_PACKAGES_DIR)/fcgi/include
     50FASTCGI_LIBS = $(RUNTIME_PACKAGES_DIR)/fcgi/libfcgi/libfcgi.a
    5151else
    5252FASTCGI_DEFS =
    … …  
    6666Z3950_DEFS = -DUSE_Z3950
    6767Z3950_INCLUDES = -I$(Z3950_DIR)
    68 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(PACKAGES_DIR)/yaz/lib/libyaz.a
     68Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a
    6969else
    7070Z3950_DEFS =

  • gsdl/trunk/runtime-src/src/z3950/Makefile.in

    r18225 r18226  
    3131INDEXERS_DIR = $(COMMON_DIR)/indexers
    3232COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    33 PACKAGES_DIR = $(RUNTIME_DIR)/packages
     33RUNTIME_PACKAGES_DIR = $(RUNTIME_DIR)/packages
    3434COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
    3535PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
    … …  
    6161# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
    6262INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    63     -I$(INDEXERS_DIR)/mgpp/text -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/include \
    64     -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(PACKAGES_DIR)/d2m
     63    -I$(INDEXERS_DIR)/mgpp/text -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \
     64    -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(RUNTIME_PACKAGES_DIR)/d2m
    6565INSTALL = @INSTALL@
    6666LDFLAGS = @LDFLAGS@
    6767LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
    6868    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \
    69     $(PACKAGES_DIR)/yaz/lib/libyaz.a $(PACKAGES_DIR)/d2m/libd2m.a -lxml2
     69    $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2
    7070RANLIB = @RANLIB@
    7171
    … …  
    136136gsdlz3950.a: $(LIBRARY_OBJECTS)
    137137    rm -f $(LIBRARY)
    138     $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
     138    $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
    139139    $(RANLIB) $(LIBRARY)
    140140
Note: See TracChangeset for help on using the changeset viewer.