Changeset 16779

Show
Ignore:
Timestamp:
14.08.2008 10:23:13 (11 years ago)
Author:
oranfry
Message:

look for expat in the common packages directory not runtime packages directory

Location:
gsdl/trunk/runtime-src/src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/runtime-src/src/oaiservr/Makefile.in

    r16572 r16779  
    3131INDEXERS_DIR = $(COMMON_DIR)/indexers 
    3232PACKAGES_DIR = $(RUNTIME_DIR)/packages 
     33COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
    3334COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 
    3435PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol 
     
    5758INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text 
    5859LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    59 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
     60LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    6061INSTALL = @INSTALL@ 
    6162 
  • gsdl/trunk/runtime-src/src/recpt/Makefile.in

    r16572 r16779  
    3131INDEXERS_DIR = $(COMMON_DIR)/indexers 
    3232PACKAGES_DIR = $(RUNTIME_DIR)/packages 
     33COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
    3334COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 
    3435PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol 
     
    8283        -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 
    8384    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \ 
    84         -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES) 
     85        -I$(COMMON_PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES) 
    8586INSTALL = @INSTALL@ 
    8687LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    87 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 
     88LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 
    8889    $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
    8990RANLIB = @RANLIB@