Changeset 15546 for gsdl/trunk/src/recpt/win32.mak

Timestamp:

2008-05-16T15:32:08+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added a new "PACKAGE_DIRS" path value in the Makefiles to make paths a bit shorter.

File:

• gsdl/trunk/src/recpt/win32.mak (modified) (4 diffs)

gsdl/trunk/src/recpt/win32.mak

@@ -27 +27 @@
 GSDL_DIR = ..\..
 INDEXERS_DIR = $(GSDL_DIR)\indexers
+PACKAGES_DIR = $(GSDL_DIR)\packages
 COLSERVR_DIR = $(GSDL_DIR)\src\colservr
 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol
@@ -39 +40 @@
 ENABLE_ACCENTFOLD = 1
 
-STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport"
+STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport"
 
 
@@ -66 +67 @@
 Z3950_INCLUDES = -I$(Z3950_DIR)
 Z3950_LDFLAGS = /link /NOD:msvcrt.lib
-Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(GSDL_DIR)\packages\yaz\yaz-2.1.4\lib\yaz.lib
+Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib
 !ELSE
 Z3950_DEFS = 
@@ -80 +81 @@
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
-    -I"$(GSDL_DIR)\packages\windows\crypt\crypt" -I"$(GSDL_DIR)\packages\windows\expat\expat" \
-    -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm" $(Z3950_INCLUDES)
+    -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \
+    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(Z3950_INCLUDES)
 LDFLAGS = $(Z3950_LDFLAGS)
-LIBS = "$(GSDL_DIR)\packages\windows\crypt\crypt\crypt.lib" "$(GSDL_DIR)\packages\windows\expat\expat\libexpat.lib" \
-        "$(GSDL_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS)
+LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+        "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS)
 
 !IF $(GSDL_VC4)