Changeset 16779 for gsdl/trunk/runtime-src

Timestamp:

2008-08-14T10:23:13+12:00 (16 years ago)

Author:

oranfry

Message:

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

Location:

gsdl/trunk/runtime-src/src

Files:

• oaiservr/Makefile.in (modified) (2 diffs)
• recpt/Makefile.in (modified) (2 diffs)

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

@@ -31 +31 @@
 INDEXERS_DIR = $(COMMON_DIR)/indexers
 PACKAGES_DIR = $(RUNTIME_DIR)/packages
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
 PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
@@ -57 +58 @@
 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
+LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
 INSTALL = @INSTALL@
 

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

@@ -31 +31 @@
 INDEXERS_DIR = $(COMMON_DIR)/indexers
 PACKAGES_DIR = $(RUNTIME_DIR)/packages
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
 PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
@@ -82 +83 @@
         -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
     -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
-        -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
+        -I$(COMMON_PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
+LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
     $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
 RANLIB = @RANLIB@