Finish rename

10 files changed, 12 insertions, 12 deletions

diff --git a/configure.py b/configure.py
index 1f407ee54..921d1c27f 100755
--- a/configure.py
+++ b/configure.py
@@ -299,7 +299,7 @@ def process_command_line(args):
                            help='choose how links are created')
 
     build_group.add_option('--makefile-style', metavar='STYLE', default=None,
-                           help='choose a makefile style (unix or nmake)')
+                           help='choose a makefile style (gmake or nmake)')
 
     build_group.add_option('--with-local-config',
                            dest='local_config', metavar='FILE',
@@ -1483,8 +1483,8 @@ def setup_build(build_config, options, template_vars):
     def choose_makefile_template(style):
         if style == 'nmake':
             return 'nmake.in'
-        elif style == 'unix':
-            return ('gmake.in')
+        elif style == 'gmake':
+            return 'gmake.in'
         else:
             raise Exception('Unknown makefile style "%s"' % (style))
 
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 59bb09f6d..d68d9a167 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -12,7 +12,7 @@ lang_flags "-D_REENTRANT -std=c++11"
 maintainer_warning_flags "-Werror"
 warning_flags "-Wextra -Wall"
 
-makefile_style unix
+makefile_style gmake
 
 lib_opt_flags "-O3"
 app_opt_flags "-O2"
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index 80e78ecf8..b93a67171 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -18,7 +18,7 @@ ar_command "pathCC -ar -o"
 shared_flags "-fPIC"
 debug_flags -g
 
-makefile_style unix
+makefile_style gmake
 
 <so_link_flags>
 default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index bd977187e..94cb48c94 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -20,7 +20,7 @@ debug_flags "-g"
 visibility_build_flags "-fvisibility=hidden"
 visibility_attribute '__attribute__((visibility("default")))'
 
-makefile_style unix
+makefile_style gmake
 
 <so_link_flags>
 # The default works for GNU ld and several other Unix linkers
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 975b68234..e6008abad 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -16,7 +16,7 @@ lang_flags "-AA -ext +eh -z"
 warning_flags "" # +w
 shared_flags "+Z"
 
-makefile_style unix
+makefile_style gmake
 
 <mach_abi_linking>
 hppa1.0 -> "+DAportable"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index fcad09513..df447967c 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -16,7 +16,7 @@ lang_flags "-std=c++0x"
 warning_flags "-w1"
 shared_flags "-fPIC"
 
-makefile_style unix
+makefile_style gmake
 
 <mach_opt>
 pentium3  -> "-march=pentium3"
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index 69aee9f10..fb520ef20 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -16,7 +16,7 @@ shared_flags "-fPIC"
 lang_flags "-ansi -LANG:ansi-for-init-scope=ON"
 warning_flags "-Wall -W"
 
-makefile_style unix
+makefile_style gmake
 
 <so_link_flags>
 default -> "$(CXX) -shared -Wl,-soname,$(SONAME)"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 4a5335a1e..032bbe72f 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -12,7 +12,7 @@ lib_opt_flags "-fast -Minline"
 app_opt_flags "-fast"
 shared_flags "-fPIC"
 
-makefile_style unix
+makefile_style gmake
 
 <so_link_flags>
 linux   -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index ca280f924..cf29b9687 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -18,7 +18,7 @@ lang_flags "+p -features=extensions -D__FUNCTION__=__func__"
 
 ar_command "CC -xar -o"
 
-makefile_style unix
+makefile_style gmake
 
 <so_link_flags>
 default -> "$(CXX) -G -h$(SONAME)"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 3e83691d6..bfa67f40f 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -14,7 +14,7 @@ lang_flags ""
 debug_flags -g
 no_debug_flags ""
 
-makefile_style unix
+makefile_style gmake
 
 <mach_opt>
 cellppu   -> "-qarch=cell"