Changeset 21426


Ignore:
Timestamp:
01/06/10 00:38:48 (11 years ago)
Author:
davidb
Message:

Using ENABLE_JDBM to control is jdbm Java code is used

Location:
main/trunk/greenstone2/common-src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/Makefile.in

    r21365 r21426  
    6161  src/gdbmedit/gdbmkeys src/gdbmedit/gdbmdel \
    6262  src/getpw
     63
     64ENABLE_JDBM=@ENABLE_JDBM@
     65
     66ifeq ($(ENABLE_JDBM), 1)
     67COMPILEDDIRS += jdbmedit
     68INSTALLDIRS  += jdbmedit
     69endif
     70
    6371
    6472MODULEDIRS = @MODULEDIRS@
  • main/trunk/greenstone2/common-src/packages/Makefile.in

    r21423 r21426  
    2626
    2727
    28 USE_JDBM=@USE_JDBM@
     28ENABLE_JDBM=@ENABLE_JDBM@
    2929
    30 ifeq ($(USE_JDBM), 1)
     30ifeq ($(ENABLE_JDBM), 1)
    3131JDBM_DIR = jdbm/jdbm-1.0
    3232else
     
    5656          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
    5757        done
    58 ifeq ($(USE_JDBM), 1)
     58ifeq ($(ENABLE_JDBM), 1)
    5959# do 'make install' in jdbm directory to get the jar file into the right place
    6060    cd $(JDBM_DIR) && $(MAKE) $(MDEFINES) install
Note: See TracChangeset for help on using the changeset viewer.