Changeset 21426 for main/trunk

Timestamp:

2010-01-06T00:38:48+13:00 (14 years ago)

Author:

davidb

Message:

Using ENABLE_JDBM to control is jdbm Java code is used

Location:

main/trunk/greenstone2/common-src

Files:

• Makefile.in (modified) (1 diff)
• packages/Makefile.in (modified) (2 diffs)

main/trunk/greenstone2/common-src/Makefile.in

@@ -61 +61 @@
   src/gdbmedit/gdbmkeys src/gdbmedit/gdbmdel \
   src/getpw 
+
+ENABLE_JDBM=@ENABLE_JDBM@
+
+ifeq ($(ENABLE_JDBM), 1)
+COMPILEDDIRS += jdbmedit
+INSTALLDIRS  += jdbmedit
+endif
+
 
 MODULEDIRS = @MODULEDIRS@

main/trunk/greenstone2/common-src/packages/Makefile.in

@@ -26 +26 @@
 
 
-USE_JDBM=@USE_JDBM@
+ENABLE_JDBM=@ENABLE_JDBM@
 
-ifeq ($(USE_JDBM), 1)
+ifeq ($(ENABLE_JDBM), 1)
 JDBM_DIR = jdbm/jdbm-1.0
 else
@@ -56 +56 @@
           (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
         done
-ifeq ($(USE_JDBM), 1)
+ifeq ($(ENABLE_JDBM), 1)
 # do 'make install' in jdbm directory to get the jar file into the right place
     cd $(JDBM_DIR) && $(MAKE) $(MDEFINES) install