1.1 --- a/common/autoconf/source-dirs.m4 Thu Nov 07 08:16:05 2013 -0800
1.2 +++ b/common/autoconf/source-dirs.m4 Thu Nov 14 10:53:23 2013 +0100
1.3 @@ -80,32 +80,25 @@
1.4 cd "$CURDIR"
1.5 # Verify that the addon source root does not have any root makefiles.
1.6 # If it does, then it is usually an error, prevent this.
1.7 - if test -f $with_add_source_root/langtools/makefiles/Makefile || \
1.8 - test -f $with_add_source_root/langtools/make/Makefile; then
1.9 + if test -f $with_add_source_root/langtools/make/Makefile; then
1.10 AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
1.11 fi
1.12 - if test -f $with_add_source_root/corba/makefiles/Makefile || \
1.13 - test -f $with_add_source_root/corba/make/Makefile; then
1.14 + if test -f $with_add_source_root/corba/make/Makefile; then
1.15 AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
1.16 fi
1.17 - if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
1.18 - test -f $with_add_source_root/jaxp/make/Makefile; then
1.19 + if test -f $with_add_source_root/jaxp/make/Makefile; then
1.20 AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
1.21 fi
1.22 - if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
1.23 - test -f $with_add_source_root/jaxws/make/Makefile; then
1.24 + if test -f $with_add_source_root/jaxws/make/Makefile; then
1.25 AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
1.26 fi
1.27 - if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
1.28 - test -f $with_add_source_root/hotspot/make/Makefile; then
1.29 + if test -f $with_add_source_root/hotspot/make/Makefile; then
1.30 AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
1.31 fi
1.32 - if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
1.33 - test -f $with_add_source_root/nashorn/make/Makefile; then
1.34 + if test -f $with_add_source_root/nashorn/make/Makefile; then
1.35 AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
1.36 fi
1.37 - if test -f $with_add_source_root/jdk/makefiles/Makefile || \
1.38 - test -f $with_add_source_root/jdk/make/Makefile; then
1.39 + if test -f $with_add_source_root/jdk/make/Makefile; then
1.40 AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
1.41 fi
1.42 fi
1.43 @@ -119,32 +112,25 @@
1.44 cd "$with_override_source_root"
1.45 OVERRIDE_SRC_ROOT="`pwd`"
1.46 cd "$CURDIR"
1.47 - if test -f $with_override_source_root/langtools/makefiles/Makefile || \
1.48 - test -f $with_override_source_root/langtools/make/Makefile; then
1.49 + if test -f $with_override_source_root/langtools/make/Makefile; then
1.50 AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
1.51 fi
1.52 - if test -f $with_override_source_root/corba/makefiles/Makefile || \
1.53 - test -f $with_override_source_root/corba/make/Makefile; then
1.54 + if test -f $with_override_source_root/corba/make/Makefile; then
1.55 AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
1.56 fi
1.57 - if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
1.58 - test -f $with_override_source_root/jaxp/make/Makefile; then
1.59 + if test -f $with_override_source_root/jaxp/make/Makefile; then
1.60 AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
1.61 fi
1.62 - if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
1.63 - test -f $with_override_source_root/jaxws/make/Makefile; then
1.64 + if test -f $with_override_source_root/jaxws/make/Makefile; then
1.65 AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
1.66 fi
1.67 - if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
1.68 - test -f $with_override_source_root/hotspot/make/Makefile; then
1.69 + if test -f $with_override_source_root/hotspot/make/Makefile; then
1.70 AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
1.71 fi
1.72 - if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
1.73 - test -f $with_override_source_root/nashorn/make/Makefile; then
1.74 + if test -f $with_override_source_root/nashorn/make/Makefile; then
1.75 AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.])
1.76 fi
1.77 - if test -f $with_override_source_root/jdk/makefiles/Makefile || \
1.78 - test -f $with_override_source_root/jdk/make/Makefile; then
1.79 + if test -f $with_override_source_root/jdk/make/Makefile; then
1.80 AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
1.81 fi
1.82 fi
1.83 @@ -195,7 +181,7 @@
1.84 cd "$with_override_langtools"
1.85 LANGTOOLS_TOPDIR="`pwd`"
1.86 cd "$CURDIR"
1.87 - if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
1.88 + if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
1.89 AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
1.90 fi
1.91 AC_MSG_CHECKING([if langtools should be overridden])
1.92 @@ -206,7 +192,7 @@
1.93 cd "$with_override_corba"
1.94 CORBA_TOPDIR="`pwd`"
1.95 cd "$CURDIR"
1.96 - if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
1.97 + if ! test -f $CORBA_TOPDIR/make/Makefile; then
1.98 AC_MSG_ERROR([You have to override corba with a full corba repo!])
1.99 fi
1.100 AC_MSG_CHECKING([if corba should be overridden])
1.101 @@ -217,7 +203,7 @@
1.102 cd "$with_override_jaxp"
1.103 JAXP_TOPDIR="`pwd`"
1.104 cd "$CURDIR"
1.105 - if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
1.106 + if ! test -f $JAXP_TOPDIR/make/Makefile; then
1.107 AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
1.108 fi
1.109 AC_MSG_CHECKING([if jaxp should be overridden])
1.110 @@ -228,7 +214,7 @@
1.111 cd "$with_override_jaxws"
1.112 JAXWS_TOPDIR="`pwd`"
1.113 cd "$CURDIR"
1.114 - if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
1.115 + if ! test -f $JAXWS_TOPDIR/make/Makefile; then
1.116 AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
1.117 fi
1.118 AC_MSG_CHECKING([if jaxws should be overridden])
1.119 @@ -239,8 +225,7 @@
1.120 cd "$with_override_hotspot"
1.121 HOTSPOT_TOPDIR="`pwd`"
1.122 cd "$CURDIR"
1.123 - if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
1.124 - ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
1.125 + if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
1.126 AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
1.127 fi
1.128 AC_MSG_CHECKING([if hotspot should be overridden])
1.129 @@ -251,7 +236,7 @@
1.130 cd "$with_override_nashorn"
1.131 NASHORN_TOPDIR="`pwd`"
1.132 cd "$CURDIR"
1.133 - if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
1.134 + if ! test -f $NASHORN_TOPDIR/make/Makefile; then
1.135 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
1.136 fi
1.137 AC_MSG_CHECKING([if nashorn should be overridden])
1.138 @@ -262,7 +247,7 @@
1.139 cd "$with_override_jdk"
1.140 JDK_TOPDIR="`pwd`"
1.141 cd "$CURDIR"
1.142 - if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
1.143 + if ! test -f $JDK_TOPDIR/make/Makefile; then
1.144 AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
1.145 fi
1.146 AC_MSG_CHECKING([if JDK should be overridden])
