comparison make/bsd/makefiles/vm.make @ 14338:7865629d6f22

Merge
author dcubed
date Mon, 10 Feb 2014 12:58:53 -0800
parents 67d6392ed21e
children d8041d695d19
comparison
equal deleted inserted replaced
14337:5eee9a9aeb7a 14338:7865629d6f22
1 # 1 #
2 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
365 DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ) 365 DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ)
366 366
367 install_jvm: $(LIBJVM) 367 install_jvm: $(LIBJVM)
368 @echo "Copying $(LIBJVM) to $(DEST_JVM)" 368 @echo "Copying $(LIBJVM) to $(DEST_JVM)"
369 ifeq ($(OS_VENDOR), Darwin) 369 ifeq ($(OS_VENDOR), Darwin)
370 $(QUIETLY) test -d $(LIBJVM_DEBUGINFO) && \ 370 $(QUIETLY) test ! -d $(LIBJVM_DEBUGINFO) || \
371 cp -f -r $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO) 371 cp -f -r $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
372 else 372 else
373 $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \ 373 $(QUIETLY) test ! -f $(LIBJVM_DEBUGINFO) || \
374 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO) 374 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
375 endif 375 endif
376 $(QUIETLY) test -f $(LIBJVM_DIZ) && \ 376 $(QUIETLY) test ! -f $(LIBJVM_DIZ) || \
377 cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ) 377 cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ)
378 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" 378 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
379 379
380 #---------------------------------------------------------------------- 380 #----------------------------------------------------------------------
381 # Other files 381 # Other files