Changeset 18226 for gsdl/trunk/runtime-src/src/oaiservr/Makefile.in

Timestamp:

2008-12-17T14:45:37+13:00 (15 years ago)

Author:

mdewsnip

Message:

Changed PACKAGES_DIR to RUNTIME_PACKAGES_DIR, for my sanity.

File:

• gsdl/trunk/runtime-src/src/oaiservr/Makefile.in (modified) (4 diffs)

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

@@ -1 +1 @@
 ###########################################################################
 #
-# Makefile -- src/oaiservr
+# Makefile -- runtime-src/src/oaiservr
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -30 +30 @@
 
 INDEXERS_DIR = $(COMMON_DIR)/indexers
-PACKAGES_DIR = $(RUNTIME_DIR)/packages
 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
@@ -46 +45 @@
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
-SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
+SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
 else
 SQLITE_LIBS = 
@@ -58 +57 @@
 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@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
+LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
+    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
 INSTALL = @INSTALL@