Changeset 12493

Timestamp:

2006-08-22T14:55:59+12:00 (18 years ago)

Author:

kjdon

Message:

d2m under the control of USE_Z3950, but yaz compilation now under the control of USE_YAZ

File:

• trunk/gsdl/packages/Makefile.in (modified) (3 diffs)

trunk/gsdl/packages/Makefile.in

@@ -30 +30 @@
 # clean, and distclean.
 USE_Z3950=@USE_Z3950@
+USE_YAZ=@USE_YAZ@
 ifeq ($(USE_Z3950), 1)
-# we only compile the src and client dirs for now. also need d2m
-YAZ=yaz/yaz-2.1.4/src yaz/yaz-2.1.4/client d2m
+# make sure USE_YAZ is set
+USE_YAZ=1
+D2M=d2m
+else
+D2M=
+endif
+
+ifeq ($(USE_YAZ), 1)
+# we only compile the src and client dirs for now.
+YAZ=yaz/yaz-2.1.4/src yaz/yaz-2.1.4/client 
 else
 YAZ=
@@ -51 +60 @@
 PACKAGEDIRS =   wv/wv-gs rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
         wget/wget-1.9 expat/ cpan/XML-Parser-2.34 \
-        $(YAZ) $(CORBA) \
+        $(YAZ) $(D2M) $(CORBA) \
         xlhtml/xlhtml-0.4.9.0 isis-gdl \
             cgicc/
@@ -71 +80 @@
     cp -fr mico/man ../man
 endif
-ifeq ($(USE_Z3950), 1)
+ifeq ($(USE_YAZ), 1)
 # need to do make install in include and src dirs to get the header files and
 # lib file into the right place