projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91a8658
)
Quote various places in Windows makefile to deal with directories
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 5 Oct 2006 13:19:10 +0000
(13:19 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 5 Oct 2006 13:19:10 +0000
(13:19 +0000)
with blanks in them.
win/makefile
patch
|
blob
|
history
diff --git
a/win/makefile
b/win/makefile
index
a9205aa
..
7618577
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# Zebra makefile for MS NMAKE
# Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.57 2006-09-22 10:18:06 adam Exp $
+# $Id: makefile,v 1.58 2006-10-05 13:19:10 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-39,18
+39,19
@@
all: dirs expat iconv libxml2 libxslt yaz dll zserver zebraidx tstflock
ROOTDIR=.. # The home of zebra
# YAZ include files, libraries, etc.
ROOTDIR=.. # The home of zebra
# YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
+YAZDIR=$(ROOTDIR)\..\yaz # or \program files\yaz
+
YAZINCL=$(YAZDIR)\include
YAZLIBS=$(YAZLIB)
YAZBINDIR=$(YAZDIR)\bin
!if $(DEBUG)
YAZINCL=$(YAZDIR)\include
YAZLIBS=$(YAZLIB)
YAZBINDIR=$(YAZDIR)\bin
!if $(DEBUG)
-YAZLIB=$(YAZDIR)\lib\yazd.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yazd.dll
-YAZ_DLL_TARGET=$(BINDIR)\yazd.dll
+YAZLIB="$(YAZDIR)\lib\yazd.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yazd.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yazd.dll"
!else
!else
-YAZLIB=$(YAZDIR)\lib\yaz.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
-YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
+YAZLIB="$(YAZDIR)\lib\yaz.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz.dll"
!endif
# BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
!endif
# BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@
-129,12
+130,12
@@
dll: $(DLL)
!if $(HAVE_EXPAT)
EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
!if $(HAVE_EXPAT)
EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
-EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll"
-EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll"
+EXPAT_DLL_SOURCE= $(EXPAT_DIR)\libs\libexpat.dll
+EXPAT_DLL_TARGET=$(BINDIR)\libexpat.dll
expat: $(EXPAT_DLL_TARGET)
expat: $(EXPAT_DLL_TARGET)
-$(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
- copy $(EXPAT_DLL_SOURCE) $(EXPAT_DLL_TARGET)
+$(EXPAT_DLL_TARGET) : "$(EXPAT_DLL_SOURCE)"
+ copy "$(EXPAT_DLL_SOURCE)" "$(EXPAT_DLL_TARGET)"
!else
EXPAT_DEF= /D HAVE_EXPAT_H=0
EXPAT_LIB=
!else
EXPAT_DEF= /D HAVE_EXPAT_H=0
EXPAT_LIB=
@@
-502,7
+503,7
@@
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
yaz: $(YAZ_DLL_TARGET)
$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
yaz: $(YAZ_DLL_TARGET)
$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-# copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
- copy $(YAZBINDIR)\*.dll $(BINDIR)
+# copy "$(YAZBINDIR)\*.dll.manifest" $(BINDIR)
+ copy "$(YAZBINDIR)\*.dll" $(BINDIR)